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

Fix a playback bug in shink_callback()

Browse source 
Invalid event data would be accessed if a play message isn't queued
which will cause crash problems.

It came about in the addition of time-based resume.

Change-Id: I1d5219064e2bf552b4183e9db4e7b380ffbe7a67
This commit is contained in:
Michael Sevakis 2014-06-20 04:54:18 -04:00
parent a77c6b9d96
commit 221c495432
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
apps/playback.c
View file

@ -842,9 +842,10 @@ static int shrink_callback(int handle, unsigned hints, void* start, size_t old_s
bool play_queued = queue_peek_ex(&audio_queue, &ev, QPEEK_REMOVE_EVENTS, bool play_queued = queue_peek_ex(&audio_queue, &ev, QPEEK_REMOVE_EVENTS,
filter_list); filter_list);
if (playing && ev.data != (intptr_t)&resume) if (playing && (elapsed > 0 || offset > 0))
{ {
resume = *(struct audio_resume_info *)ev.data; if (play_queued)
resume = *(struct audio_resume_info *)ev.data;
/* current id3->elapsed/offset are king */ /* current id3->elapsed/offset are king */
if (elapsed > 0) if (elapsed > 0)