From b6f6578683b5297f42517b0d7953a6dfcb9188a7 Mon Sep 17 00:00:00 2001
From: erouault <erouault>
Date: Sat, 9 Sep 2017 21:44:42 +0000
Subject: * libtiff/tif_dirread.c: add NULL check to avoid likely false
 positive null-pointer dereference warning by CLang Static Analyzer.

---
 ChangeLog             | 7 ++++++-
 libtiff/tif_dirread.c | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6a2aeaa2..6a708e88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2017-09-27  Even Rouault <even.rouault at spatialys.com>
+2017-09-09  Even Rouault <even.rouault at spatialys.com>
+
+	* libtiff/tif_dirread.c: add NULL check to avoid likely false positive
+	null-pointer dereference warning by CLang Static Analyzer.
+
+2017-09-07  Even Rouault <even.rouault at spatialys.com>
 
 	* libtiff/tiffiop.h, tif_aux.c: redirect SeekOK() macro to a _TIFFSeekoK()
 	function that checks if the offset is not bigger than INT64_MAX, so as
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
index f7b3850b..5e62e813 100644
--- a/libtiff/tif_dirread.c
+++ b/libtiff/tif_dirread.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dirread.c,v 1.217 2017-07-15 14:27:50 erouault Exp $ */
+/* $Id: tif_dirread.c,v 1.218 2017-09-09 21:44:42 erouault Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -2832,7 +2832,7 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryPersampleShort(TIFF* tif, TIFFDi
 	if (direntry->tdir_count<(uint64)tif->tif_dir.td_samplesperpixel)
 		return(TIFFReadDirEntryErrCount);
 	err=TIFFReadDirEntryShortArray(tif,direntry,&m);
-	if (err!=TIFFReadDirEntryErrOk)
+	if (err!=TIFFReadDirEntryErrOk || m == NULL)
 		return(err);
 	na=m;
 	nb=tif->tif_dir.td_samplesperpixel;
-- 
cgit v1.2.1