[FFmpeg-cvslog] avcodec/tiff: reset geotag_count in free_geotags()
Michael Niedermayer
git at videolan.org
Sun Feb 23 17:46:56 CET 2014
ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 2 01:47:36 2014 +0100| [ebc490e7445ccbcd1bc8ce6ded06e2fff209d40e] | committer: Michael Niedermayer
avcodec/tiff: reset geotag_count in free_geotags()
Fixes null pointer dereference
Fixes: signal_sigsegv_19d922e_3688_cov_1577641655_aletrek_tiff.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a744064c4155bde063b9e8a47699542be3b8e5eb)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ebc490e7445ccbcd1bc8ce6ded06e2fff209d40e
---
libavcodec/tiff.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 2b100ed..80c6d6e 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -79,6 +79,7 @@ static void free_geotags(TiffContext *const s)
av_freep(&s->geotags[i].val);
}
av_freep(&s->geotags);
+ s->geotag_count = 0;
}
#define RET_GEOKEY(TYPE, array, element)\
More information about the ffmpeg-cvslog
mailing list