diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-03-13 20:45:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-08-23 13:15:17 +0200 |
| commit | e695be347efa647f961e8502a21d11a81426cf2a (patch) | |
| tree | cfbb38f856dbb249944d1edee011c7052706a0cd | |
| parent | 00bebaca773886ed00d618156112895e47706c62 (diff) | |
| download | ffmpeg-e695be347efa647f961e8502a21d11a81426cf2a.tar.gz | |
avcodec/tiff: Check for multiple geo key directories
Fixes memleak
Fixes: 826/clusterfuzz-testcase-5316921379520512
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 108b02e5471c1dae248200db694aba9b7b8555a8)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/tiff.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index a337dc0ff0..0998aa1302 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1036,6 +1036,10 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) ADD_METADATA(count, "ModelTiepointTag", NULL); break; case TIFF_GEO_KEY_DIRECTORY: + if (s->geotag_count) { + avpriv_request_sample(s->avctx, "Multiple geo key directories\n"); + return AVERROR_INVALIDDATA; + } ADD_METADATA(1, "GeoTIFF_Version", NULL); ADD_METADATA(2, "GeoTIFF_Key_Revision", "."); s->geotag_count = ff_tget_short(&s->gb, s->le); |