aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-11 23:24:23 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-14 12:20:16 +0200
commita1a7dd4da0b5633ff951720b79c9b7116342855d (patch)
tree465e669b44413bda410ed9551c38e5a4fa2965c3
parent54eaad7c6e321dc2ba1cc9e973b4f49d74a3e20a (diff)
downloadffmpeg-a1a7dd4da0b5633ff951720b79c9b7116342855d.tar.gz
avcodec/diracdec: Fix Assertion frame->buf[0] failed at libavcodec/decode.c:610
Fixes: 1487/clusterfuzz-testcase-minimized-6288036495097856 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 6899e6e56065d9365963e02690dc9e2ce7866050) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/diracdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index e0604af103..f334f313a6 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -2041,9 +2041,9 @@ static int get_delayed_pic(DiracContext *s, AVFrame *picture, int *got_frame)
if (out) {
out->reference ^= DELAYED_PIC_REF;
- *got_frame = 1;
if((ret = av_frame_ref(picture, out->avframe)) < 0)
return ret;
+ *got_frame = 1;
}
return 0;