You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
101 lines
3.1 KiB
101 lines
3.1 KiB
From d60332057b9575ada4f264489582b13e30137be1 Mon Sep 17 00:00:00 2001
|
|
From: erouault <erouault>
|
|
Date: Wed, 11 Jan 2017 19:02:49 +0000
|
|
Subject: [PATCH] * libtiff/tiffiop.h, tif_unix.c, tif_win32.c, tif_vms.c: add
|
|
_TIFFcalloc()
|
|
|
|
* libtiff/tif_read.c: TIFFReadBufferSetup(): use _TIFFcalloc() to zero
|
|
initialize tif_rawdata.
|
|
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2651
|
|
---
|
|
ChangeLog | 8 ++++++++
|
|
libtiff/tif_read.c | 4 +++-
|
|
libtiff/tif_unix.c | 8 ++++++++
|
|
libtiff/tif_vms.c | 8 ++++++++
|
|
libtiff/tif_win32.c | 8 ++++++++
|
|
libtiff/tiffio.h | 1 +
|
|
6 files changed, 36 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 6a342e5..abd75d7 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,5 +1,13 @@
|
|
2017-01-11 Even Rouault <even.rouault at spatialys.com>
|
|
|
|
+ * libtiff/tiffiop.h, tif_unix.c, tif_win32.c, tif_vms.c: add _TIFFcalloc()
|
|
+
|
|
+ * libtiff/tif_read.c: TIFFReadBufferSetup(): use _TIFFcalloc() to zero
|
|
+ initialize tif_rawdata.
|
|
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2651
|
|
+
|
|
+2017-01-11 Even Rouault <even.rouault at spatialys.com>
|
|
+
|
|
* libtiff/tif_getimage.c: add explicit uint32 cast in putagreytile to
|
|
avoid UndefinedBehaviorSanitizer warning.
|
|
Patch by Nicolás Peña.
|
|
diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
|
|
index 277fdd6..4535ccb 100644
|
|
--- a/libtiff/tif_read.c
|
|
+++ b/libtiff/tif_read.c
|
|
@@ -985,7 +985,9 @@ TIFFReadBufferSetup(TIFF* tif, void* bp, tmsize_t size)
|
|
"Invalid buffer size");
|
|
return (0);
|
|
}
|
|
- tif->tif_rawdata = (uint8*) _TIFFmalloc(tif->tif_rawdatasize);
|
|
+ /* Initialize to zero to avoid uninitialized buffers in case of */
|
|
+ /* short reads (http://bugzilla.maptools.org/show_bug.cgi?id=2651) */
|
|
+ tif->tif_rawdata = (uint8*) _TIFFcalloc(1, tif->tif_rawdatasize);
|
|
tif->tif_flags |= TIFF_MYBUFFER;
|
|
}
|
|
if (tif->tif_rawdata == NULL) {
|
|
diff --git a/libtiff/tif_unix.c b/libtiff/tif_unix.c
|
|
index 7c7bc96..89dd32e 100644
|
|
--- a/libtiff/tif_unix.c
|
|
+++ b/libtiff/tif_unix.c
|
|
@@ -316,6 +316,14 @@ _TIFFmalloc(tmsize_t s)
|
|
return (malloc((size_t) s));
|
|
}
|
|
|
|
+void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz)
|
|
+{
|
|
+ if( nmemb == 0 || siz == 0 )
|
|
+ return ((void *) NULL);
|
|
+
|
|
+ return calloc((size_t) nmemb, (size_t)siz);
|
|
+}
|
|
+
|
|
void
|
|
_TIFFfree(void* p)
|
|
{
|
|
diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c
|
|
index d730b3a..3e9001b 100644
|
|
--- a/libtiff/tif_win32.c
|
|
+++ b/libtiff/tif_win32.c
|
|
@@ -360,6 +360,14 @@ _TIFFmalloc(tmsize_t s)
|
|
return (malloc((size_t) s));
|
|
}
|
|
|
|
+void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz)
|
|
+{
|
|
+ if( nmemb == 0 || siz == 0 )
|
|
+ return ((void *) NULL);
|
|
+
|
|
+ return calloc((size_t) nmemb, (size_t)siz);
|
|
+}
|
|
+
|
|
void
|
|
_TIFFfree(void* p)
|
|
{
|
|
diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h
|
|
index 732da17..fbd9171 100644
|
|
--- a/libtiff/tiffio.h
|
|
+++ b/libtiff/tiffio.h
|
|
@@ -293,6 +293,7 @@ extern TIFFCodec* TIFFGetConfiguredCODECs(void);
|
|
*/
|
|
|
|
extern void* _TIFFmalloc(tmsize_t s);
|
|
+extern void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz);
|
|
extern void* _TIFFrealloc(void* p, tmsize_t s);
|
|
extern void _TIFFmemset(void* p, int v, tmsize_t c);
|
|
extern void _TIFFmemcpy(void* d, const void* s, tmsize_t c);
|