[FFmpeg-cvslog] avcodec/diracdec: Check for arith decoder errors in dirac_unpack_block_motion_data()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun May 12 19:43:08 2019 +0200| [90db25a16e5aa0a7bfd78397298febd3eb121828] | committer: Michael Niedermayer

avcodec/diracdec: Check for arith decoder errors in dirac_unpack_block_motion_data()

Fixes: Timeout (54sec -> 188ms)
Fixes: 14585/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5649933052411904

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90db25a16e5aa0a7bfd78397298febd3eb121828
---

 libavcodec/diracdec.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index a5bb6d5f34..52a1951690 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -1551,6 +1551,11 @@ static int dirac_unpack_block_motion_data(DiracContext *s)
                 }
         }
 
+    for (i = 0; i < 4 + 2*s->num_refs; i++) {
+        if (arith[i].error)
+            return arith[i].error;
+    }
+
     return 0;
 }