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

Fixed header parsing in AIFF. The minimum header size is 54 bytes for an audio file. SSND chunk block_size and offset are 32-bit values, not 16-bit; this bug would probably never even matter since most sound data isn't block aligned.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11596 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2006-11-25 21:27:46 +00:00
parent 17507b979d
commit cee9d3b47b
2 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/codecs/aiff.c
View file

@ -95,7 +95,7 @@ next_track:
/* assume the AIFF header is less than 1024 bytes */ /* assume the AIFF header is less than 1024 bytes */
buf = ci->request_buffer(&n, 1024); buf = ci->request_buffer(&n, 1024);
if (n < 44) { if (n < 54) {
i = CODEC_ERROR; i = CODEC_ERROR;
goto done; goto done;
} }
@ -142,9 +142,9 @@ next_track:
goto done; goto done;
} }
/* offset2snd */ /* offset2snd */
offset2snd = ((buf[8]<<8)|buf[9]); offset2snd = (buf[8]<<24)|(buf[9]<<16)|(buf[10]<<8)|buf[11];
/* block_size */ /* block_size */
block_size = ((buf[10]<<8)|buf[11]); block_size = (buf[12]<<24)|(buf[13]<<16)|(buf[14]<<8)|buf[15];
if (block_size == 0) if (block_size == 0)
block_size = num_channels*sample_size; block_size = num_channels*sample_size;
numbytes = i - 8 - offset2snd; numbytes = i - 8 - offset2snd;

68
apps/metadata.c
View file

@ -1676,45 +1676,45 @@ static bool get_adx_metadata(int fd, struct mp3entry* id3)
/* Soul Calibur 2 style (type 03) */ /* Soul Calibur 2 style (type 03) */
DEBUGF("get_adx_metadata: type 03 found\n"); DEBUGF("get_adx_metadata: type 03 found\n");
/* check if header is too small for loop data */ /* check if header is too small for loop data */
if (chanstart-6 < 0x2c) looping=0; if (chanstart-6 < 0x2c) looping=0;
else { else {
looping = (buf[0x18]) || looping = (buf[0x18]) ||
(buf[0x19]) || (buf[0x19]) ||
(buf[0x1a]) || (buf[0x1a]) ||
(buf[0x1b]); (buf[0x1b]);
end_adr = (buf[0x28]<<24) | end_adr = (buf[0x28]<<24) |
(buf[0x29]<<16) | (buf[0x29]<<16) |
(buf[0x2a]<<8) | (buf[0x2a]<<8) |
(buf[0x2b]); (buf[0x2b]);
start_adr = ( start_adr = (
(buf[0x1c]<<24) | (buf[0x1c]<<24) |
(buf[0x1d]<<16) | (buf[0x1d]<<16) |
(buf[0x1e]<<8) | (buf[0x1e]<<8) |
(buf[0x1f]) (buf[0x1f])
)/32*channels*18+chanstart; )/32*channels*18+chanstart;
} }
} else if (!memcmp(buf+0x10,"\x01\xF4\x04\x00",4)) { } else if (!memcmp(buf+0x10,"\x01\xF4\x04\x00",4)) {
/* Standard (type 04) */ /* Standard (type 04) */
DEBUGF("get_adx_metadata: type 04 found\n"); DEBUGF("get_adx_metadata: type 04 found\n");
/* check if header is too small for loop data */ /* check if header is too small for loop data */
if (chanstart-6 < 0x38) looping=0; if (chanstart-6 < 0x38) looping=0;
else { else {
looping = (buf[0x24]) || looping = (buf[0x24]) ||
(buf[0x25]) || (buf[0x25]) ||
(buf[0x26]) || (buf[0x26]) ||
(buf[0x27]); (buf[0x27]);
end_adr = (buf[0x34]<<24) | end_adr = (buf[0x34]<<24) |
(buf[0x35]<<16) | (buf[0x35]<<16) |
(buf[0x36]<<8) | (buf[0x36]<<8) |
buf[0x37]; buf[0x37];
start_adr = ( start_adr = (
(buf[0x28]<<24) | (buf[0x28]<<24) |
(buf[0x29]<<16) | (buf[0x29]<<16) |
(buf[0x2a]<<8) | (buf[0x2a]<<8) |
(buf[0x2b]) (buf[0x2b])
)/32*channels*18+chanstart; )/32*channels*18+chanstart;
} }
} else { } else {
DEBUGF("get_adx_metadata: error, couldn't determine ADX type\n"); DEBUGF("get_adx_metadata: error, couldn't determine ADX type\n");
return false; return false;
@ -1752,7 +1752,7 @@ static bool get_aiff_metadata(int fd, struct mp3entry* id3)
int i; int i;
if ((lseek(fd, 0, SEEK_SET) < 0) if ((lseek(fd, 0, SEEK_SET) < 0)
|| ((read_bytes = read(fd, buf, sizeof(id3->path))) < 44)) || ((read_bytes = read(fd, buf, sizeof(id3->path))) < 54))
{ {
return false; return false;
} }