(TIFFReadDirEntryFloatArray): Fix Coverity 298627 "Logically dead

code".
(TIFFReadDirEntryIfd8Array): Fix Coverity 298628 "Logically dead
code".

2 files changed, 5 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 19d2b021..fff57dbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,10 @@
 
 	* libtiff/tif_dirread.c (TIFFReadDirEntryDoubleArray): Fix
 	Coverity 298626 "Logically dead code".
-	(TIFFReadDirEntryFloatArray): Fix 298627 "Logically dead code".
+	(TIFFReadDirEntryFloatArray): Fix Coverity 298627 "Logically dead
+	code".
+	(TIFFReadDirEntryIfd8Array): Fix Coverity 298628 "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 fabba5d9..2d664be9 100644
--- a/libtiff/tif_dirread.c
+++ b/libtiff/tif_dirread.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dirread.c,v 1.185 2015-05-31 21:05:22 bfriesen Exp $ */
+/* $Id: tif_dirread.c,v 1.186 2015-05-31 21:07:41 bfriesen Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -2713,11 +2713,6 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryIfd8Array(TIFF* tif, TIFFDirEntr
 			break;
 	}
 	_TIFFfree(origdata);
-	if (err!=TIFFReadDirEntryErrOk)
-	{
-		_TIFFfree(data);
-		return(err);
-	}
 	*value=data;
 	return(TIFFReadDirEntryErrOk);
 }