Merge branch 'issue-179' into 'master'

tif_fax3.h: check for buffer overflow in EXPAND2D before "calling" CLEANUP_RUNS() Closes #179 See merge request libtiff/libtiff!112
2020-03-05 11:39:34 +00:00 · 2020-03-05 11:39:34 +00:00 · d71530462f
commit d71530462f
parent 25b274126d b351db8be1
1 changed files with 3 additions and 1 deletions
--- a/libtiff/tif_fax3.h
+++ b/libtiff/tif_fax3.h
@ -514,7 +514,9 @@ done1d:									\
 	    goto eol2d;							\
 	eof2d:								\
 	    prematureEOF(a0);						\
-	    CLEANUP_RUNS();						\
+		if (pa < thisrun + sp->nruns) {	\
+		    CLEANUP_RUNS();					\
+		}								\
 	    goto eoflab;						\
 	}								\
    }									\