diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/filelist.c | 38 |
2 files changed, 24 insertions, 19 deletions
@@ -1,3 +1,8 @@ +git HEAD + + * Patch by Michael Vorburger: Fix erroneous free() in case of failed + scandir (closes #147) + Fri, 28 Feb 2014 18:20:25 +0100 Daniel Friesel <derf+feh@finalrewind.org> * Release v2.10 diff --git a/src/filelist.c b/src/filelist.c index 8d19e41..e06c6de 100644 --- a/src/filelist.c +++ b/src/filelist.c @@ -263,27 +263,27 @@ void add_file_to_filelist_recursively(char *origpath, unsigned char level) default: weprintf("Failed to scan directory %s:", path); } - } - - for (cnt = 0; cnt < n; cnt++) { - if (strcmp(de[cnt]->d_name, ".") - && strcmp(de[cnt]->d_name, "..")) { - char *newfile; - - newfile = estrjoin("", path, "/", de[cnt]->d_name, NULL); - - /* This ensures we go down one level even if not fully recursive - - this way "feh some_dir" expands to some_dir's contents */ - if (opt.recursive) - add_file_to_filelist_recursively(newfile, FILELIST_CONTINUE); - else - add_file_to_filelist_recursively(newfile, FILELIST_LAST); - - free(newfile); + } else { + for (cnt = 0; cnt < n; cnt++) { + if (strcmp(de[cnt]->d_name, ".") + && strcmp(de[cnt]->d_name, "..")) { + char *newfile; + + newfile = estrjoin("", path, "/", de[cnt]->d_name, NULL); + + /* This ensures we go down one level even if not fully recursive + - this way "feh some_dir" expands to some_dir's contents */ + if (opt.recursive) + add_file_to_filelist_recursively(newfile, FILELIST_CONTINUE); + else + add_file_to_filelist_recursively(newfile, FILELIST_LAST); + + free(newfile); + } + free(de[cnt]); } - free(de[cnt]); + free(de); } - free(de); closedir(dir); } else if (S_ISREG(st.st_mode)) { D(("Adding regular file %s to filelist\n", path)); |