Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Pictureflow bugs

Browse source 
It turns out that aa_cache.buf, used to store decoded album art during
background scanning, was not correctly allocated and overlapped with
memory allocated for buflib. This was what caused all the segfaults.

Also fixed a logic error in read_pfraw(), which returns a buflib handle
on success, but also returned 0 on failure -- since 0 is a valid buflib
handle, it should return -1 on failure instead.

Change-Id: Ifaa1c02ec19b0859e43c40c0462ed7738d07fec3
This commit is contained in:
Aidan MacDonald 2021-04-08 10:03:28 +01:00 committed by Solomon Peachy
parent 4dc602dd7f
commit afe80742a5
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/plugins/pictureflow/pictureflow.c
View file

@ -2311,7 +2311,7 @@ static int read_pfraw(char* filename, int prio)
if (hid < 0) { if (hid < 0) {
rb->close( fh ); rb->close( fh );
return 0; return -1;
} }
rb->yield(); /* allow audio to play when fast scrolling */ rb->yield(); /* allow audio to play when fast scrolling */
@ -2347,7 +2347,7 @@ static inline bool load_and_prepare_surface(const int slide_index,
hash_album, hash_artist); hash_album, hash_artist);
int hid = read_pfraw(pfraw_file, prio); int hid = read_pfraw(pfraw_file, prio);
if (!hid) if (hid < 0)
return false; return false;
pf_sldcache.cache[cache_index].hid = hid; pf_sldcache.cache[cache_index].hid = hid;
@ -3589,9 +3589,10 @@ static int pictureflow_main(void)
pf_idx.buf_sz -= aa_bufsz; pf_idx.buf_sz -= aa_bufsz;
ALIGN_BUFFER(pf_idx.buf, pf_idx.buf_sz, 4); ALIGN_BUFFER(pf_idx.buf, pf_idx.buf_sz, 4);
aa_cache.buf = (char*) pf_idx.buf + aa_bufsz; aa_cache.buf = (char*) pf_idx.buf;
aa_cache.buf_sz = aa_bufsz; aa_cache.buf_sz = aa_bufsz;
ALIGN_BUFFER(aa_cache.buf, aa_cache.buf_sz, 4); pf_idx.buf += aa_bufsz;
ALIGN_BUFFER(pf_idx.buf, pf_idx.buf_sz, 4);
if (!create_empty_slide(pf_cfg.cache_version != CACHE_VERSION)) { if (!create_empty_slide(pf_cfg.cache_version != CACHE_VERSION)) {
config_save(CACHE_REBUILD); config_save(CACHE_REBUILD);
@ -3613,7 +3614,7 @@ static int pictureflow_main(void)
rb->buflib_init(&buf_ctx, (void *)pf_idx.buf, pf_idx.buf_sz); rb->buflib_init(&buf_ctx, (void *)pf_idx.buf, pf_idx.buf_sz);
if (!(empty_slide_hid = read_pfraw(EMPTY_SLIDE, 0))) if ((empty_slide_hid = read_pfraw(EMPTY_SLIDE, 0)) < 0)
{ {
error_wait("Unable to load empty slide image"); error_wait("Unable to load empty slide image");
return PLUGIN_ERROR; return PLUGIN_ERROR;