diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-03-21 01:55:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-20 03:41:33 +0200 |
| commit | 95594b9815e80a50f228cccb1a84c0b28968f8af (patch) | |
| tree | 3c74a359cbda3eb1f4ef09974e7e57ae14a5b393 | |
| parent | a2a028af6e6f42b837afd7ab02e43ec1375be746 (diff) | |
| download | ffmpeg-95594b9815e80a50f228cccb1a84c0b28968f8af.tar.gz | |
avcodec/tiff: Check geotag count for being non zero
Fixes memleak
Fixes: 874/clusterfuzz-testcase-5252796175613952
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3182e19c1c29eef60208a67ad8ecad1d9a2d0694)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/tiff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 70e34b469d..3bc31a4545 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1056,7 +1056,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) s->geotag_count = count / 4 - 1; av_log(s->avctx, AV_LOG_WARNING, "GeoTIFF key directory buffer shorter than specified\n"); } - if (bytestream2_get_bytes_left(&s->gb) < s->geotag_count * sizeof(int16_t) * 4) { + if ( bytestream2_get_bytes_left(&s->gb) < s->geotag_count * sizeof(int16_t) * 4 + || s->geotag_count == 0) { s->geotag_count = 0; return -1; } |