diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-02 01:47:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-23 14:48:07 +0100 |
| commit | ebc490e7445ccbcd1bc8ce6ded06e2fff209d40e (patch) | |
| tree | 82ee5e1633edc4258821d7d8669900db89cecd6a | |
| parent | ab1c7113f9ec1e169d654990dc5379af1570d2ce (diff) | |
| download | ffmpeg-ebc490e7445ccbcd1bc8ce6ded06e2fff209d40e.tar.gz | |
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@gmx.at>
(cherry picked from commit a744064c4155bde063b9e8a47699542be3b8e5eb)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/tiff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 2b100ede5e..80c6d6e376 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)\ |