diff options
Diffstat (limited to 'third_party/libtiff/0022-upstream-patch-0012.patch')
-rw-r--r-- | third_party/libtiff/0022-upstream-patch-0012.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/third_party/libtiff/0022-upstream-patch-0012.patch b/third_party/libtiff/0022-upstream-patch-0012.patch deleted file mode 100644 index ce9b5ebc91..0000000000 --- a/third_party/libtiff/0022-upstream-patch-0012.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/third_party/libtiff/tif_read.c b/third_party/libtiff/tif_read.c -index c25e7e79f..47686a473 100644 ---- a/third_party/libtiff/tif_read.c -+++ b/third_party/libtiff/tif_read.c -@@ -983,9 +983,9 @@ TIFFReadBufferSetup(TIFF* tif, void* bp, tmsize_t size) - "Invalid buffer size"); - return (0); - } -- tif->tif_rawdata = (uint8*) _TIFFmalloc(tif->tif_rawdatasize); -- if (tif->tif_rawdata) -- memset(tif->tif_rawdata, 0, 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; - } -diff --git a/third_party/libtiff/tiffio.h b/third_party/libtiff/tiffio.h -index dd6c9a429..7d0da761f 100644 ---- a/third_party/libtiff/tiffio.h -+++ b/third_party/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); |