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.
87 lines
2.6 KiB
87 lines
2.6 KiB
7 years ago
|
From 669faf71833c4c2e72774b2e732ca4d28b149c83 Mon Sep 17 00:00:00 2001
|
||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||
|
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 | 6 ++++--
|
||
|
libtiff/tif_unix.c | 10 +++++++++-
|
||
|
libtiff/tif_vms.c | 10 +++++++++-
|
||
|
libtiff/tif_win32.c | 10 +++++++++-
|
||
|
libtiff/tiffio.h | 3 ++-
|
||
|
6 files changed, 41 insertions(+), 6 deletions(-)
|
||
|
|
||
|
diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
|
||
|
index b2edb029a90c..6a8c7daf3dfa 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 81e9d6653c2a..80c437cfa37a 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 24b824f1bd56..090baed87135 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 6e508181dbce..ef61b5c06a03 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);
|
||
|
--
|
||
|
2.12.0
|
||
|
|