diff mbox series

[FFmpeg-devel,4/5] avcodec/escape124: Do not return random numbers

Message ID 20230918223534.23567-4-michael@niedermayer.cc
State Accepted
Commit fe6d46490f5ea9155fe0601b6246960ae17317fc
Headers show
Series [FFmpeg-devel,1/5] tools/target_dec_fuzzer: Adjust wmapro threshold | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Michael Niedermayer Sept. 18, 2023, 10:35 p.m. UTC 
Fixes: out of array access
Fixes: 62164/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ESCAPE124_fuzzer-6035022714634240
Fixes: 62164/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ESCAPE124_fuzzer-6422176201572352

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/escape124.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c
index cd62f8d1f04..357320ef94f 100644
--- a/libavcodec/escape124.c
+++ b/libavcodec/escape124.c
@@ -234,7 +234,7 @@  static int escape124_decode_frame(AVCodecContext *avctx, AVFrame *frame,
         if ((ret = av_frame_ref(frame, s->frame)) < 0)
             return ret;
 
-        return frame_size;
+        return 0;
     }
 
     for (i = 0; i < 3; i++) {
@@ -367,7 +367,7 @@  static int escape124_decode_frame(AVCodecContext *avctx, AVFrame *frame,
 
     *got_frame = 1;
 
-    return frame_size;
+    return 0;
 }