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

Fix a possible NULL pointer dereference I introduced in r15503 by making an unwise assumption. This would cause crashes on track skip in certain (very unlikely, I think) situations.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15557 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nicolas Pennequin 2007-11-10 18:22:55 +00:00
parent a953e65dbd
commit a677678e31
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/playback.c
View file

@ -2548,6 +2548,7 @@ static int audio_check_new_track(void)
{ {
int track_count = audio_track_count(); int track_count = audio_track_count();
int old_track_ridx = track_ridx; int old_track_ridx = track_ridx;
int i, idx;
bool forward; bool forward;
if (dir_skip) if (dir_skip)
@ -2603,12 +2604,12 @@ static int audio_check_new_track(void)
/* Save the old track */ /* Save the old track */
copy_mp3entry(&prevtrack_id3, &curtrack_id3); copy_mp3entry(&prevtrack_id3, &curtrack_id3);
int i, idx;
for (i = 0; i < ci.new_track; i++) for (i = 0; i < ci.new_track; i++)
{ {
idx = (track_ridx + i) & MAX_TRACK_MASK; idx = (track_ridx + i) & MAX_TRACK_MASK;
if ((unsigned)buf_handle_offset(tracks[idx].audio_hid) > struct mp3entry *id3 = bufgetid3(tracks[idx].id3_hid);
bufgetid3(tracks[idx].id3_hid)->first_frame_offset) ssize_t offset = buf_handle_offset(tracks[idx].audio_hid);
if (!id3 || offset < 0 || (unsigned)offset > id3->first_frame_offset)
{ {
/* We don't have all the audio data for that track, so clear it */ /* We don't have all the audio data for that track, so clear it */
clear_track_info(&tracks[idx]); clear_track_info(&tracks[idx]);