diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-08-04 08:26:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-15 12:25:45 +0100 |
| commit | bf3520cd641d11f133c52f192ce7ec84119a685a (patch) | |
| tree | 656ec19f2997397d30999add975b6f395ce82efc | |
| parent | d218b9e0671659fbb0f10fe2dc4e67fe6e94aaab (diff) | |
| download | ffmpeg-bf3520cd641d11f133c52f192ce7ec84119a685a.tar.gz | |
avcodec/apedec: Do not partially clear data array
Fixes: Assertion failure and memleak
Fixes: 15709/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5182435093905408
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8e4b522c9146b9c14579ae7381fb1043b7423578)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/apedec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 7a7097e7a4..1a86ac1786 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1451,7 +1451,8 @@ static int ape_decode_frame(AVCodecContext *avctx, void *data, if (s->fileversion >= 3900) { if (offset > 3) { av_log(avctx, AV_LOG_ERROR, "Incorrect offset passed\n"); - s->data = NULL; + av_freep(&s->data); + s->data_size = 0; return AVERROR_INVALIDDATA; } if (s->data_end - s->ptr < offset) { |