summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2022-12-14 20:12:19 +0000
committerEven Rouault <even.rouault@spatialys.com>2022-12-14 20:12:19 +0000
commit0c16f2d84bc10a761fb45de354ca2a7d4b92d951 (patch)
tree00ad259b85c15f58fda542f0c261308877a34757
parent193c94b30ca5c7720454a786672ec48718ef3698 (diff)
parentc2a28a12c6f7292183819a28ab3715384bd36960 (diff)
downloadlibtiff-git-0c16f2d84bc10a761fb45de354ca2a7d4b92d951.tar.gz
Merge branch 'ossfuzz_54311' into 'master'
TIFFWriteDirectorySec(): avoid harmless unsigned-integer-overflow See merge request libtiff/libtiff!446
-rw-r--r--libtiff/tif_dirwrite.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
index beebd116..717afbac 100644
--- a/libtiff/tif_dirwrite.c
+++ b/libtiff/tif_dirwrite.c
@@ -1114,7 +1114,12 @@ static int TIFFWriteDirectorySec(TIFF *tif, int isimage, int imagedone,
if (tif->tif_dataoff & 1)
tif->tif_dataoff++;
if (isimage)
- tif->tif_curdir++;
+ {
+ if (tif->tif_curdir == TIFF_NON_EXISTENT_DIR_NUMBER)
+ tif->tif_curdir = 0;
+ else
+ tif->tif_curdir++;
+ }
}
if (isimage)
{