aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-01-26 00:24:49 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2018-04-13 00:35:15 +0200
commit38384cdd991cf6c7d28f365c368523d8c8066d3e (patch)
treec6c11f97e81e7d7785f75738c14ba1a13555fbd5 /libavcodec
parent4019c2a67c6aafeadb93aa8fc741cc3915817597 (diff)
downloadffmpeg-38384cdd991cf6c7d28f365c368523d8c8066d3e.tar.gz
avcodec/indeo5: Do not leave frame_type set to an invalid value
Fixes: null pointer dereference Fixes: 5264/clusterfuzz-testcase-minimized-4621956621008896 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 2ff9f178519b68d4d1d606eb5451ad81da948efc) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/indeo5.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c
index 5f931c8b98..5028def4bc 100644
--- a/libavcodec/indeo5.c
+++ b/libavcodec/indeo5.c
@@ -324,6 +324,7 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
ctx->frame_type = get_bits(&ctx->gb, 3);
if (ctx->frame_type >= 5) {
av_log(avctx, AV_LOG_ERROR, "Invalid frame type: %d \n", ctx->frame_type);
+ ctx->frame_type = FRAMETYPE_INTRA;
return AVERROR_INVALIDDATA;
}