diff mbox

[FFmpeg-devel,1/5] avcodec/apedec: Set error on error in ape_decode_value_3860()

Message ID 20191118163014.31474-1-michael@niedermayer.cc
State Accepted
Commit 2c2ee67fd36edaac88914e9d75e00f16a9a7cc17
Headers show

Commit Message

Michael Niedermayer Nov. 18, 2019, 4:30 p.m. UTC 
Fixes: Timeout (unknown -> 15sec)
Fixes: 18808/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5677586072207360

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/apedec.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Michael Niedermayer Dec. 14, 2019, 9:35 p.m. UTC | #1 
On Mon, Nov 18, 2019 at 05:30:10PM +0100, Michael Niedermayer wrote:
> Fixes: Timeout (unknown -> 15sec)
> Fixes: 18808/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5677586072207360
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/apedec.c | 1 +
>  1 file changed, 1 insertion(+)

will apply patchset

[...]
diff mbox

Patch

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index cfcf9a06c1..1aadef080f 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -496,6 +496,7 @@  static inline int ape_decode_value_3860(APEContext *ctx, GetBitContext *gb,
         x = (overflow << rice->k) + get_bits(gb, rice->k);
     } else {
         av_log(ctx->avctx, AV_LOG_ERROR, "Too many bits: %"PRIu32"\n", rice->k);
+        ctx->error = 1;
         return AVERROR_INVALIDDATA;
     }
     rice->ksum += x - (rice->ksum + 8 >> 4);