dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 01:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

sandbox: avoid memory leak in os_dirent_ls

Browse Source 
Realloc does not free the old memory area if it fails.

Identified by cppcheck.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Heinrich Schuchardt
2017-09-21 12:56:07 +02:00
committed by Simon Glass
parent 68a345294a
commit 04d0da5157
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/sandbox/cpu/os.c
View File

@@ -319,6 +319,7 @@ int os_dirent_ls(const char *dirname, struct os_dirent_node **headp)
DIR *dir; DIR *dir;
int ret; int ret;
char *fname; char *fname;
char *old_fname;
int len; int len;
int dirlen; int dirlen;
@@ -344,16 +345,23 @@ int os_dirent_ls(const char *dirname, struct os_dirent_node **headp)
break; break;
} }
next = malloc(sizeof(*node) + strlen(entry->d_name) + 1); next = malloc(sizeof(*node) + strlen(entry->d_name) + 1);
if (dirlen + strlen(entry->d_name) > len) { if (!next) {
len = dirlen + strlen(entry->d_name);
fname = realloc(fname, len);
}
if (!next || !fname) {
free(next);
os_dirent_free(head); os_dirent_free(head);
ret = -ENOMEM; ret = -ENOMEM;
goto done; goto done;
} }
if (dirlen + strlen(entry->d_name) > len) {
len = dirlen + strlen(entry->d_name);
old_fname = fname;
fname = realloc(fname, len);
if (!fname) {
free(old_fname);
free(next);
os_dirent_free(head);
ret = -ENOMEM;
goto done;
}
}
next->next = NULL; next->next = NULL;
strcpy(next->name, entry->d_name); strcpy(next->name, entry->d_name);
switch (entry->d_type) { switch (entry->d_type) {