summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfwarmerdam <fwarmerdam>2012-06-13 00:27:20 +0000
committerfwarmerdam <fwarmerdam>2012-06-13 00:27:20 +0000
commit4d17f22bc68204ea5412fd4dff04e3629f40e3a7 (patch)
tree20faade2df1340ecd7544954731b0ff56f23c4c0
parentdc530f6b984da44ec6c54975c7f06a949f088482 (diff)
downloadlibtiff-4d17f22bc68204ea5412fd4dff04e3629f40e3a7.tar.gz
ensure fax3/4 runs array is initialized
-rw-r--r--ChangeLog4
-rw-r--r--libtiff/tif_fax3.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f3ad8cd..559ea4a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-12 Frank Warmerdam <warmerdam@google.com>
+
+ * libtiff/tif_fax3.c: Ensure runs array is initialized to zeros.
+
2012-06-07 Frank Warmerdam <warmerdam@google.com>
* libtiff/tif_print.c: avoid pretty printing other fields when
diff --git a/libtiff/tif_fax3.c b/libtiff/tif_fax3.c
index 52c16b40..15b17108 100644
--- a/libtiff/tif_fax3.c
+++ b/libtiff/tif_fax3.c
@@ -1,4 +1,4 @@
-/* $Id: tif_fax3.c,v 1.72 2010-06-09 17:17:13 bfriesen Exp $ */
+/* $Id: tif_fax3.c,v 1.73 2012-06-13 00:27:20 fwarmerdam Exp $ */
/*
* Copyright (c) 1990-1997 Sam Leffler
@@ -526,6 +526,7 @@ Fax3SetupState(TIFF* tif)
"for Group 3/4 run arrays");
if (dsp->runs == NULL)
return (0);
+ memset( dsp->runs, 0, TIFFSafeMultiply(uint32,nruns,2));
dsp->curruns = dsp->runs;
if (needsRefLine)
dsp->refruns = dsp->runs + nruns;