Skip to content
Snippets Groups Projects
Commit 04d0da51 authored by Heinrich Schuchardt's avatar Heinrich Schuchardt Committed by Simon Glass
Browse files

sandbox: avoid memory leak in os_dirent_ls


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

Identified by cppcheck.

Signed-off-by: default avatarHeinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: default avatarSimon Glass <sjg@chromium.org>
parent 68a34529
No related branches found
No related tags found
No related merge requests found
...@@ -319,6 +319,7 @@ int os_dirent_ls(const char *dirname, struct os_dirent_node **headp) ...@@ -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) ...@@ -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) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment