diff mbox

[FFmpeg-devel,2/2] avcodec/tiff: Check palette shift

Message ID 20170314005224.24980-2-michael@niedermayer.cc
State Accepted
Commit cfa10e11be4c17fdff0c77cba7c0b3d6ea99acea
Headers show

Commit Message

Michael Niedermayer March 14, 2017, 12:52 a.m. UTC
Fixes multiple  runtime error: shift exponent 792 is too large for 32-bit type 'unsigned int'

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

Patch

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 456da5142b..0be7be7528 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -996,6 +996,11 @@  static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
         bytestream2_skip(&pal_gb[2], count / 3 * off * 2);
 
         off = (type_sizes[type] - 1) << 3;
+        if (off > 31U) {
+            av_log(s->avctx, AV_LOG_ERROR, "palette shift %d is out of range\n", off);
+            return AVERROR_INVALIDDATA;
+        }
+
         for (i = 0; i < count / 3; i++) {
             uint32_t p = 0xFF000000;
             p |= (ff_tget(&pal_gb[0], type, s->le) >> off) << 16;