summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-11-20 14:12:38 +0100
committerEven Rouault <even.rouault@spatialys.com>2020-11-20 14:12:38 +0100
commit69c6b526632b6d887a20c16be4041af8cc341763 (patch)
treecac667da022750f3767c8731c482dff057109feb
parentdadd8c7dceafbeddcf47bc04fac354bb7d8a3615 (diff)
downloadlibtiff-git-69c6b526632b6d887a20c16be4041af8cc341763.tar.gz
tif_lzw.c: avoid false positive -Wnull-dereference of mingw32 gcc 7.3
-rw-r--r--libtiff/tif_lzw.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/libtiff/tif_lzw.c b/libtiff/tif_lzw.c
index 7bb61078..d92d0fd3 100644
--- a/libtiff/tif_lzw.c
+++ b/libtiff/tif_lzw.c
@@ -214,19 +214,16 @@ LZWSetupDecode(TIFF* tif)
return (0);
}
- DecoderState(tif)->dec_codetab = NULL;
- DecoderState(tif)->dec_decode = NULL;
+ sp = DecoderState(tif);
+ sp->dec_codetab = NULL;
+ sp->dec_decode = NULL;
/*
* Setup predictor setup.
*/
(void) TIFFPredictorInit(tif);
-
- sp = DecoderState(tif);
}
- assert(sp != NULL);
-
if (sp->dec_codetab == NULL) {
sp->dec_codetab = (code_t*)_TIFFmalloc(CSIZE*sizeof (code_t));
if (sp->dec_codetab == NULL) {