virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

avcodec/wmadec: Keep track of exponent initialization per channel

Browse Source 
Fixes: division by 0
Fixes: 19123/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMAV2_fuzzer-5655493121146880

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit bf5c850b795126d4f60dd9498c06f0492f5726a7)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-11-30 16:46:46 +01:00
parent 8e75a69850
commit 332f7a4c00
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/wma.h
View File

@ -123,7 +123,7 @@ typedef struct WMACodecContext {
uint8_t last_superframe[MAX_CODED_SUPERFRAME_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; /* padding added */ uint8_t last_superframe[MAX_CODED_SUPERFRAME_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; /* padding added */
int last_bitoffset; int last_bitoffset;
int last_superframe_len; int last_superframe_len;
int exponents_initialized; int exponents_initialized[MAX_CHANNELS];
float noise_table[NOISE_TAB_SIZE]; float noise_table[NOISE_TAB_SIZE];
int noise_index; int noise_index;
float noise_mult; /* XXX: suppress that and integrate it in the noise array */ float noise_mult; /* XXX: suppress that and integrate it in the noise array */

9
libavcodec/wmadec.c
View File

@ -585,11 +585,14 @@ static int wma_decode_block(WMACodecContext *s)
decode_exp_lsp(s, ch); decode_exp_lsp(s, ch);
} }
s->exponents_bsize[ch] = bsize; s->exponents_bsize[ch] = bsize;
s->exponents_initialized[ch] = 1;
} }
} }
s->exponents_initialized = 1; }
}else if (!s->exponents_initialized) {
return AVERROR_INVALIDDATA; for (ch = 0; ch < s->avctx->channels; ch++) {
if (s->channel_coded[ch] && !s->exponents_initialized[ch])
return AVERROR_INVALIDDATA;
} }
/* parse spectral coefficients : just RLE encoding */ /* parse spectral coefficients : just RLE encoding */