leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-dm

Browse Source
This commit is contained in:
Tom Rini
2017-10-09 20:19:39 -04:00
parent 74d90d17ee 04d0da5157
commit ebdd65258b
15 changed files with 61 additions and 57 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;
int ret;
char *fname;
char *old_fname;
int len;
int dirlen;
@@ -344,16 +345,23 @@ int os_dirent_ls(const char *dirname, struct os_dirent_node **headp)
break;
}
next = malloc(sizeof(*node) + strlen(entry->d_name) + 1);
if (dirlen + strlen(entry->d_name) > len) {
len = dirlen + strlen(entry->d_name);
fname = realloc(fname, len);
}
if (!next || !fname) {
free(next);
if (!next) {
os_dirent_free(head);
ret = -ENOMEM;
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;
strcpy(next->name, entry->d_name);
switch (entry->d_type) {