diff options
| author | fwarmerdam <fwarmerdam> | 2012-06-21 01:01:53 +0000 |
|---|---|---|
| committer | fwarmerdam <fwarmerdam> | 2012-06-21 01:01:53 +0000 |
| commit | 85c3baef8b7ffdfc48e041d32215c2044b14772e (patch) | |
| tree | 1d44f28817cf22d4cbac958119fa3f6e3f791c26 | |
| parent | 6ef03f15c5f74f873f83d4b36104da118434b747 (diff) | |
| download | libtiff-85c3baef8b7ffdfc48e041d32215c2044b14772e.tar.gz | |
make tbuf large enough for one stride past the end
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libtiff/tif_pixarlog.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2012-06-20 Frank Warmerdam <warmerdam@google.com> + + * libtiff/tif_pixarlog.c: Make sure tbuf is large enough for one + full "stride" past the end. + 2012-06-19 Frank Warmerdam <warmerdam@google.com> * libtiff/tif_packbits.c: fix read past end of data buffer. diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c index c1b6ff2e..e5831170 100644 --- a/libtiff/tif_pixarlog.c +++ b/libtiff/tif_pixarlog.c @@ -1,4 +1,4 @@ -/* $Id: tif_pixarlog.c,v 1.37 2012-05-24 23:21:45 fwarmerdam Exp $ */ +/* $Id: tif_pixarlog.c,v 1.38 2012-06-21 01:01:53 fwarmerdam Exp $ */ /* * Copyright (c) 1996-1997 Sam Leffler @@ -673,7 +673,7 @@ PixarLogSetupDecode(TIFF* tif) td->td_rowsperstrip), sizeof(uint16)); if (tbuf_size == 0) return (0); /* TODO: this is an error return without error report through TIFFErrorExt */ - sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size+sizeof(uint16)); + sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size+sizeof(uint16)*sp->stride); if (sp->tbuf == NULL) return (0); if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) |