Browse Source

sanity checks (should prevent hypothetical div by zero issue)

should fix sf bug #1547313

Originally committed as revision 9164 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Michael Niedermayer 18 years ago
parent
commit
47b777ceed
2 changed files with 7 additions and 1 deletions
  1. +5
    -0
      libavcodec/wma.c
  2. +2
    -1
      libavcodec/wmadec.c

+ 5
- 0
libavcodec/wma.c View File

@@ -72,6 +72,11 @@ int ff_wma_init(AVCodecContext * avctx, int flags2)
int sample_rate1;
int coef_vlc_table;

if( avctx->sample_rate<=0 || avctx->sample_rate>50000
|| avctx->channels<=0 || avctx->channels>8
|| avctx->bit_rate<=0)
return -1;

s->sample_rate = avctx->sample_rate;
s->nb_channels = avctx->channels;
s->bit_rate = avctx->bit_rate;


+ 2
- 1
libavcodec/wmadec.c View File

@@ -106,7 +106,8 @@ static int wma_decode_init(AVCodecContext * avctx)
s->use_bit_reservoir = flags2 & 0x0002;
s->use_variable_block_len = flags2 & 0x0004;

ff_wma_init(avctx, flags2);
if(ff_wma_init(avctx, flags2)<0)
return -1;

/* init MDCT */
for(i = 0; i < s->nb_block_sizes; i++)


Loading…
Cancel
Save