cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* libtiff/tif_jpeg.c: fix segfault in JPEGFixupTagsSubsampling() on

Browse Source 
corrupted image where tif->tif_dir.td_stripoffset == NULL (bug #2471)
This commit is contained in:
Even Rouault 2014-11-20 14:34:51 +00:00
parent d1be5cb7ad
commit 7af4d827dd
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2014-11-20 Even Rouault <even.rouault@spatialys.com>
* libtiff/tif_jpeg.c: fix segfault in JPEGFixupTagsSubsampling() on
corrupted image where tif->tif_dir.td_stripoffset == NULL (bug #2471)
2014-11-20 Even Rouault <even.rouault@spatialys.com> 2014-11-20 Even Rouault <even.rouault@spatialys.com>
* automake: updated to 1.14.1 * automake: updated to 1.14.1
* libtool: updated to 2.4.3 * libtool: updated to 2.4.3

3
libtiff/tif_jpeg.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_jpeg.c,v 1.111 2012-07-06 18:48:04 bfriesen Exp $ */ /* $Id: tif_jpeg.c,v 1.112 2014-11-20 14:34:51 erouault Exp $ */
/* /*
* Copyright (c) 1994-1997 Sam Leffler * Copyright (c) 1994-1997 Sam Leffler
@ -729,6 +729,7 @@ JPEGFixupTagsSubsampling(TIFF* tif)
_TIFFFillStriles( tif ); _TIFFFillStriles( tif );
if( tif->tif_dir.td_stripbytecount == NULL if( tif->tif_dir.td_stripbytecount == NULL
|| tif->tif_dir.td_stripoffset == NULL
|| tif->tif_dir.td_stripbytecount[0] == 0 ) || tif->tif_dir.td_stripbytecount[0] == 0 )
{ {
/* Do not even try to check if the first strip/tile does not /* Do not even try to check if the first strip/tile does not