From: Michael Niedermayer <michael@niedermayer.cc>
Date: Thu, 11 May 2017 21:24:23 +0000 (+0200)
Subject: avcodec/diracdec: Fix Assertion frame->buf[0] failed at libavcodec/decode.c:610
X-Git-Tag: android-x86-7.1-r1~376
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6899e6e56065d9365963e02690dc9e2ce7866050;p=android-x86%2Fexternal-ffmpeg.git

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>
---

diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index 202ae94922..3573298ca1 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -2047,9 +2047,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;