diff options
| author | fwarmerdam <fwarmerdam> | 2012-06-21 02:01:31 +0000 |
|---|---|---|
| committer | fwarmerdam <fwarmerdam> | 2012-06-21 02:01:31 +0000 |
| commit | 5a9c3657860b6c107a807197dbb2ee59ea02f84f (patch) | |
| tree | 53e3c9e3af7703af2f3b23e1b96c04b819f98cae | |
| parent | 85c3baef8b7ffdfc48e041d32215c2044b14772e (diff) | |
| download | libtiff-5a9c3657860b6c107a807197dbb2ee59ea02f84f.tar.gz | |
fix fax3 runs initialization sizing
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | libtiff/tif_fax3.c | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -1,5 +1,8 @@ 2012-06-20 Frank Warmerdam <warmerdam@google.com> + * libtiff/tif_fax3.c: fix memory initialization of runs, only + partly done. + * libtiff/tif_pixarlog.c: Make sure tbuf is large enough for one full "stride" past the end. diff --git a/libtiff/tif_fax3.c b/libtiff/tif_fax3.c index 15b17108..2b2dccd0 100644 --- a/libtiff/tif_fax3.c +++ b/libtiff/tif_fax3.c @@ -1,4 +1,4 @@ -/* $Id: tif_fax3.c,v 1.73 2012-06-13 00:27:20 fwarmerdam Exp $ */ +/* $Id: tif_fax3.c,v 1.74 2012-06-21 02:01:31 fwarmerdam Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -526,7 +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)); + memset( dsp->runs, 0, TIFFSafeMultiply(uint32,nruns,2)*sizeof(uint32)); dsp->curruns = dsp->runs; if (needsRefLine) dsp->refruns = dsp->runs + nruns; |