summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-01 17:53:11 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-01 17:55:22 +0200
commit63b8d4146d78595638417e431ea390aaf01f560f (patch)
treee47d4da139c6dbcb45148e8a4154a3adbb016422
parent28b24670741e1de25bfc7b5ea7c1d6dbae1aef6f (diff)
avcodec/bmp: Use ff_set_dimensions()
Fixes out of memory Fixes: 1282/clusterfuzz-testcase-minimized-5400131681648640 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/bmp.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index 72957499d3..65d239e4f8 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -133,8 +133,11 @@ static int bmp_decode_frame(AVCodecContext *avctx,
alpha = bytestream_get_le32(&buf);
}
- avctx->width = width;
- avctx->height = height > 0 ? height : -(unsigned)height;
+ ret = ff_set_dimensions(avctx, width, height > 0 ? height : -(unsigned)height);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Failed to set dimensions %d %d\n", width, height);
+ return AVERROR_INVALIDDATA;
+ }
avctx->pix_fmt = AV_PIX_FMT_NONE;