diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-31 14:38:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-21 23:43:14 +0100 |
| commit | b385b34761415735c464b9560b1f64f8babc9ee6 (patch) | |
| tree | 16c60f3d64458c611868d42498a5af7cc9a17f76 | |
| parent | 313af229425799e15f0d810cbec1af65e5293a8a (diff) | |
| download | ffmpeg-b385b34761415735c464b9560b1f64f8babc9ee6.tar.gz | |
avcodec/wmadec: Require previous exponents for reuse
Fixes: division by zero
Fixes: 18474/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMAV2_fuzzer-5764986962182144
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 c54b9fc42fee613e2c4c0dae2052ff94cd15e254)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/wma.h | 1 | ||||
| -rw-r--r-- | libavcodec/wmadec.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/wma.h b/libavcodec/wma.h index 325f03c44b..8344cb5b93 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -123,6 +123,7 @@ typedef struct WMACodecContext { uint8_t last_superframe[MAX_CODED_SUPERFRAME_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; /* padding added */ int last_bitoffset; int last_superframe_len; + int exponents_initialized; float noise_table[NOISE_TAB_SIZE]; int noise_index; float noise_mult; /* XXX: suppress that and integrate it in the noise array */ diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 78b51e5871..bb9bc8d236 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -587,6 +587,9 @@ static int wma_decode_block(WMACodecContext *s) s->exponents_bsize[ch] = bsize; } } + s->exponents_initialized = 1; + }else if (!s->exponents_initialized) { + return AVERROR_INVALIDDATA; } /* parse spectral coefficients : just RLE encoding */ |