diff options
author | William Wilgus <wilgus.william@gmail.com> | 2020-08-24 13:22:00 -0400 |
---|---|---|
committer | William Wilgus <me.theuser@yahoo.com> | 2020-08-25 03:33:24 +0000 |
commit | 5dd4c006976130ebc3fd6309be3767614f666728 (patch) | |
tree | 74e9713d498e7e87912e1a439773dc4af9ce82cf | |
parent | 6099767a18d82e9ff8bdd701906e842f8a81d4a9 (diff) | |
download | rockbox-5dd4c006976130ebc3fd6309be3767614f666728.tar.gz rockbox-5dd4c006976130ebc3fd6309be3767614f666728.zip |
filetree.c fix null entry check fs#13222
behavior found on xduoo x3
I had already fixed this once but I was checking entry instead of dptr :(
Change-Id: Iff76a0d6796f270118dd460fb424e35e213e4030
-rw-r--r-- | apps/filetree.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index cfa14f86b5..9279f84c17 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -297,8 +297,11 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
297 | int len; | 297 | int len; |
298 | struct dirinfo info; | 298 | struct dirinfo info; |
299 | struct entry* dptr = tree_get_entry_at(c, files_in_dir); | 299 | struct entry* dptr = tree_get_entry_at(c, files_in_dir); |
300 | if (!entry) | 300 | if (!dptr) |
301 | { | ||
302 | c->dirfull = true; | ||
301 | break; | 303 | break; |
304 | } | ||
302 | 305 | ||
303 | info = dir_get_info(dir, entry); | 306 | info = dir_get_info(dir, entry); |
304 | len = strlen((char *)entry->d_name); | 307 | len = strlen((char *)entry->d_name); |
@@ -364,8 +367,7 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
364 | continue; | 367 | continue; |
365 | } | 368 | } |
366 | 369 | ||
367 | if ((len > c->cache.name_buffer_size - name_buffer_used - 1) || | 370 | if (len > c->cache.name_buffer_size - name_buffer_used - 1) { |
368 | (files_in_dir >= c->cache.max_entries)) { | ||
369 | /* Tell the world that we ran out of buffer space */ | 371 | /* Tell the world that we ran out of buffer space */ |
370 | c->dirfull = true; | 372 | c->dirfull = true; |
371 | break; | 373 | break; |