summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-09-17 00:21:25 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-17 19:23:03 +0200
commit48bbeac259a9eb323018c3715a84008867e1294f (patch)
tree0ded50fc2c78112a85fb086ac5c4feda7f2a55bf /libavcodec
parentccfdef79b132bef49f4654266d5d3da8d1deb305 (diff)
avcodec/wmaprodec: Check that the EOF frame was allocated before decoding into it
Fixes: NULL pointer dereference Fixes: 38125/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XMA1_fuzzer-5151909422432256 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/wmaprodec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index a4b48b13a8..7b489943f4 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -1855,7 +1855,7 @@ static int xma_decode_packet(AVCodecContext *avctx, void *data,
eof = 1;
for (i = 0; i < s->num_streams; i++) {
- if (!s->xma[i].eof_done) {
+ if (!s->xma[i].eof_done && s->frames[i]->data[0]) {
ret = decode_packet(avctx, &s->xma[i], s->frames[i],
&got_stream_frame_ptr, avpkt);
}