summaryrefslogtreecommitdiff
path: root/libavcodec/snowdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-09 16:08:14 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-09 16:50:18 +0200
commit78aa93807b3e0674e34d32c0bf6f78d7f5b7927e (patch)
tree0972644a3635abbc8f39d8f343a87271e64e6e56 /libavcodec/snowdec.c
parentea627dc0949c91e3ee3f98ec3ad6b4df8e96a69e (diff)
downloadffmpeg-78aa93807b3e0674e34d32c0bf6f78d7f5b7927e.tar.gz
avcodec/snowdec: Check width
Fixes: out of array read Fixes: 1419/clusterfuzz-testcase-minimized-6108700873850880 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/snowdec.c')
-rw-r--r--libavcodec/snowdec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c
index 8c35e3e084..bcb3469062 100644
--- a/libavcodec/snowdec.c
+++ b/libavcodec/snowdec.c
@@ -384,6 +384,10 @@ static int decode_header(SnowContext *s){
av_log(s->avctx, AV_LOG_ERROR, "spatial_decomposition_count %d too large for size\n", s->spatial_decomposition_count);
return AVERROR_INVALIDDATA;
}
+ if (s->avctx->width > 65536-4) {
+ av_log(s->avctx, AV_LOG_ERROR, "Width %d is too large\n", s->avctx->width);
+ return AVERROR_INVALIDDATA;
+ }
s->qlog += get_symbol(&s->c, s->header_state, 1);