diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-05 20:39:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-06 03:44:35 +0200 |
| commit | ec5e262e1d7294484e58499b758f0e29f0959915 (patch) | |
| tree | 46f6faa77b3754e85bcc92699dd7e0910281c15e | |
| parent | 0fb432a23b0aa609f20469030fd29b1e5d1a5d01 (diff) | |
| download | ffmpeg-ec5e262e1d7294484e58499b758f0e29f0959915.tar.gz | |
avcodec/tiff: Avoid loosing allocated geotag values
Fixes memleak
Fixes: 2076/clusterfuzz-testcase-minimized-6542640243802112
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 d7cbeab4c1381f95ed0ebf85d7950bee96f66164)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/tiff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 9b9d37bb83..81bf7ae54d 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1137,6 +1137,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) bytestream2_seek(&s->gb, pos + s->geotags[i].offset, SEEK_SET); if (bytestream2_get_bytes_left(&s->gb) < s->geotags[i].count) return AVERROR_INVALIDDATA; + if (s->geotags[i].val) + return AVERROR_INVALIDDATA; ap = av_malloc(s->geotags[i].count); if (!ap) { av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n"); |