devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

imageviewer: fix segfault when album art fails to load

Browse source 
Attempt to change file fails due to access to uninitialized memory with negative index

Fixup for 55a5bfe7

Change-Id: I9c42f66c856c1d4b7261da5e4996efbe9597bcd4
This commit is contained in:
Roman Artiukhin 2024-10-29 09:40:17 +02:00
parent bd02af3413
commit 914a56f34c
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
apps/plugins/imageviewer/imageviewer.c
View file

@ -136,15 +136,24 @@ static enum image_type image_type = IMAGE_UNKNOWN;
/************************* Implementation ***************************/ /************************* Implementation ***************************/
/* Read directory contents for scrolling. */ /* Read directory contents for scrolling. */
static void get_pic_list(void) static void get_pic_list(bool single_file)
{ {
file_pt = (char **) buf;
if (single_file)
{
file_pt[0] = np_file;
buf_size -= sizeof(file_pt);
entries = 1;
curfile = 0;
return;
}
struct tree_context *tree = rb->tree_get_context(); struct tree_context *tree = rb->tree_get_context();
struct entry *dircache = rb->tree_get_entries(tree); struct entry *dircache = rb->tree_get_entries(tree);
int i; int i;
char *pname; char *pname;
file_pt = (char **) buf;
/* Remove path and leave only the name.*/ /* Remove path and leave only the name.*/
pname = rb->strrchr(np_file,'/'); pname = rb->strrchr(np_file,'/');
pname++; pname++;
@ -1093,7 +1102,6 @@ enum plugin_status plugin_start(const void* parameter)
return PLUGIN_ERROR; return PLUGIN_ERROR;
} }
entries = 1;
is_album_art = true; is_album_art = true;
} }
else else
@ -1112,11 +1120,7 @@ enum plugin_status plugin_start(const void* parameter)
decoder_buf = rb->plugin_get_buffer(&decoder_buf_size); decoder_buf = rb->plugin_get_buffer(&decoder_buf_size);
buf = rb->plugin_get_audio_buffer(&buf_size); buf = rb->plugin_get_audio_buffer(&buf_size);
#endif #endif
get_pic_list(is_album_art);
if(!is_album_art)
{
get_pic_list();
}
#ifdef USEGSLIB #ifdef USEGSLIB
if (!grey_init(buf, buf_size, GREY_ON_COP, if (!grey_init(buf, buf_size, GREY_ON_COP,