storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix a crash bug on some oddly-formed WAV files.

Browse Source
This commit is contained in:
Justin Maggard 2012-03-08 18:11:01 +00:00
parent 0a0be0d96c
commit 25c74a3962
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tagutils/tagutils-wav.c
View File

@ -79,7 +79,7 @@ _get_wavtags(char *filename, struct song_metadata *psong)
/* now, walk through the chunks */ /* now, walk through the chunks */
current_offset = 12; current_offset = 12;
while(current_offset < psong->file_size) while(current_offset + 8 < psong->file_size)
{ {
len = 8; len = 8;
if(!(len = read(fd, hdr, len)) || (len != 8)) if(!(len = read(fd, hdr, len)) || (len != 8))
@ -92,7 +92,7 @@ _get_wavtags(char *filename, struct song_metadata *psong)
current_offset += 8; current_offset += 8;
block_len = GET_WAV_INT32(hdr + 4); block_len = GET_WAV_INT32(hdr + 4);
//DEBUG DPRINTF(E_DEBUG,L_SCANNER,"Read block %02x%02x%02x%02x (%c%c%c%c) of " //DEBUG DPRINTF(E_DEBUG, L_SCANNER, "Read block %02x%02x%02x%02x (%c%c%c%c) of "
// "size 0x%08x\n",hdr[0],hdr[1],hdr[2],hdr[3], // "size 0x%08x\n",hdr[0],hdr[1],hdr[2],hdr[3],
// isprint(hdr[0]) ? hdr[0] : '?', // isprint(hdr[0]) ? hdr[0] : '?',
// isprint(hdr[1]) ? hdr[1] : '?', // isprint(hdr[1]) ? hdr[1] : '?',
@ -145,7 +145,7 @@ _get_wavtags(char *filename, struct song_metadata *psong)
char **m; char **m;
len = GET_WAV_INT32(hdr + 4); len = GET_WAV_INT32(hdr + 4);
if(len > 65536) if(len > 65536 || len < 9)
goto next_block; goto next_block;
tags = malloc(len+1); tags = malloc(len+1);

1
upnphttp.c
View File

@ -2006,4 +2006,5 @@ error:
if( !newpid ) if( !newpid )
_exit(0); _exit(0);
#endif #endif
return;
} }