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

Fix some unlikely buffer problems. Doesn't fix any reported bugs, but fixes some possible ones.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9663 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Brandon Low 2006-04-14 17:00:22 +00:00
parent 86c7e1a947
commit 348d9ece4b
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/playback.c
View file

@ -1371,7 +1371,7 @@ static bool loadcodec(bool start_play)
size = filesize(fd); size = filesize(fd);
/* Never load a partial codec */ /* Never load a partial codec */
if (filebuflen - filebufused < size + AUDIO_REBUFFER_GUESS_SIZE) { if (filebuflen - filebufused < size) {
logf("Not enough space"); logf("Not enough space");
fill_bytesleft = 0; fill_bytesleft = 0;
close(fd); close(fd);
@ -1466,6 +1466,7 @@ static bool audio_load_track(int offset, bool start_play)
if (current_fd >= 0) if (current_fd >= 0)
{ {
logf("Nonzero fd in alt");
close(current_fd); close(current_fd);
current_fd = -1; current_fd = -1;
} }
@ -1533,6 +1534,19 @@ static bool audio_load_track(int offset, bool start_play)
/* Load the codec. */ /* Load the codec. */
tracks[track_widx].codecbuf = &filebuf[buf_widx]; tracks[track_widx].codecbuf = &filebuf[buf_widx];
if (!loadcodec(start_play)) { if (!loadcodec(start_play)) {
if (tracks[track_widx].codecsize)
{
/* Must undo the buffer write of the partial codec */
logf("Partial codec loaded");
fill_bytesleft += tracks[track_widx].codecsize;
filebufused -= tracks[track_widx].codecsize;
if (buf_widx < tracks[track_widx].codecsize)
buf_widx += filebuflen;
buf_widx -= tracks[track_widx].codecsize;
tracks[track_widx].codecsize = 0;
}
/* Set filesize to zero to indicate no file was loaded. */ /* Set filesize to zero to indicate no file was loaded. */
tracks[track_widx].filesize = 0; tracks[track_widx].filesize = 0;
tracks[track_widx].filerem = 0; tracks[track_widx].filerem = 0;