virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

avcodec/tiff: Check for multiple geo key directories

Browse Source 
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>
This commit is contained in:
Michael Niedermayer 2017-03-13 20:45:08 +01:00
parent 922013c983
commit b34ca8295d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/tiff.c
View File

@ -1035,6 +1035,10 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
ADD_METADATA(count, "ModelTiepointTag", NULL); ADD_METADATA(count, "ModelTiepointTag", NULL);
break; break;
case TIFF_GEO_KEY_DIRECTORY: 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(1, "GeoTIFF_Version", NULL);
ADD_METADATA(2, "GeoTIFF_Key_Revision", "."); ADD_METADATA(2, "GeoTIFF_Key_Revision", ".");
s->geotag_count = ff_tget_short(&s->gb, s->le); s->geotag_count = ff_tget_short(&s->gb, s->le);