diff --git a/ChangeLog b/ChangeLog index fff57dbe..0b39f986 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ code". (TIFFReadDirEntryIfd8Array): Fix Coverity 298628 "Logically dead code". + (TIFFReadDirEntrySlong8Array): Fix Coverity 298629 "Logically dead + code" * libtiff/tif_dir.c (TIFFNumberOfDirectories): Don't depend on ++ operator precedenc in evaluation. Might quench Coverity 1134470 diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c index 2d664be9..606366c8 100644 --- a/libtiff/tif_dirread.c +++ b/libtiff/tif_dirread.c @@ -1,4 +1,4 @@ -/* $Id: tif_dirread.c,v 1.186 2015-05-31 21:07:41 bfriesen Exp $ */ +/* $Id: tif_dirread.c,v 1.187 2015-05-31 21:09:33 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -2172,11 +2172,6 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntrySlong8Array(TIFF* tif, TIFFDirEn break; } _TIFFfree(origdata); - if (err!=TIFFReadDirEntryErrOk) - { - _TIFFfree(data); - return(err); - } *value=data; return(TIFFReadDirEntryErrOk); }