diff options
| author | bfriesen <bfriesen> | 2015-05-31 21:05:22 +0000 |
|---|---|---|
| committer | bfriesen <bfriesen> | 2015-05-31 21:05:22 +0000 |
| commit | 81d8a019ed996c5f81fd4a7d44e5dfbe02780f79 (patch) | |
| tree | 4434db743b57a63e2efbf7f3325bc5d67344ff71 | |
| parent | 2cba529cd6c402ea24e0496dddfa3445a9ea0f61 (diff) | |
| download | libtiff-81d8a019ed996c5f81fd4a7d44e5dfbe02780f79.tar.gz | |
(TIFFReadDirEntryFloatArray): Fix 298627 "Logically dead code".
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | libtiff/tif_dirread.c | 7 |
2 files changed, 2 insertions, 6 deletions
@@ -2,6 +2,7 @@ * libtiff/tif_dirread.c (TIFFReadDirEntryDoubleArray): Fix Coverity 298626 "Logically dead code". + (TIFFReadDirEntryFloatArray): Fix 298627 "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 f6104ab8..fabba5d9 100644 --- a/libtiff/tif_dirread.c +++ b/libtiff/tif_dirread.c @@ -1,4 +1,4 @@ -/* $Id: tif_dirread.c,v 1.184 2015-05-31 21:01:37 bfriesen Exp $ */ +/* $Id: tif_dirread.c,v 1.185 2015-05-31 21:05:22 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -2414,11 +2414,6 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryFloatArray(TIFF* tif, TIFFDirEnt break; } _TIFFfree(origdata); - if (err!=TIFFReadDirEntryErrOk) - { - _TIFFfree(data); - return(err); - } *value=data; return(TIFFReadDirEntryErrOk); } |