diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-25 14:33:51 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-25 14:33:51 +0000 |
commit | 0bb18f0541883f86e8c256802cda65517b48c99e (patch) | |
tree | 374956bae663d061ada6e868982456ffecb990a1 /libmpdemux | |
parent | 6f3e7cffaa0af1a5b3254ec2b24423c5c601a3dc (diff) | |
download | mpv-0bb18f0541883f86e8c256802cda65517b48c99e.tar.bz2 mpv-0bb18f0541883f86e8c256802cda65517b48c99e.tar.xz |
check for framesize validity, return -1 (error) for zero size (bug found by pl)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7911 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/mp3_hdr.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/libmpdemux/mp3_hdr.c b/libmpdemux/mp3_hdr.c index fd0b1537f6..9c068bdd17 100644 --- a/libmpdemux/mp3_hdr.c +++ b/libmpdemux/mp3_hdr.c @@ -6,13 +6,13 @@ //----------------------- mp3 audio frame header parser ----------------------- static int tabsel_123[2][3][16] = { - { {0,32,64,96,128,160,192,224,256,288,320,352,384,416,448,}, - {0,32,48,56, 64, 80, 96,112,128,160,192,224,256,320,384,}, - {0,32,40,48, 56, 64, 80, 96,112,128,160,192,224,256,320,} }, + { {0,32,64,96,128,160,192,224,256,288,320,352,384,416,448,0}, + {0,32,48,56, 64, 80, 96,112,128,160,192,224,256,320,384,0}, + {0,32,40,48, 56, 64, 80, 96,112,128,160,192,224,256,320,0} }, - { {0,32,48,56,64,80,96,112,128,144,160,176,192,224,256,}, - {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,}, - {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,} } + { {0,32,48,56,64,80,96,112,128,144,160,176,192,224,256,0}, + {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,0}, + {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,0} } }; static long freqs[9] = { 44100, 48000, 32000, 22050, 24000, 16000 , 11025 , 12000 , 8000 }; @@ -96,7 +96,13 @@ int mp_get_mp3_header(unsigned char* hbuf,int* chans, int* srate){ ssize = (stereo == 1) ? 17 : 32; if(crc) ssize += 2; - framesize = (long) tabsel_123[lsf][2][bitrate_index] * 144000; + framesize = tabsel_123[lsf][2][bitrate_index] * 144000; + + if(!framesize){ + mp_msg(MSGT_DEMUXER,MSGL_DBG2,"invalid framesize/bitrate_index\n"); + return -1; // valid: 1..14 + } + framesize /= freqs[sampling_frequency]<<lsf; framesize += padding; |