diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2017-10-17 15:13:16 +0200 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2017-10-19 07:04:41 +0000 |
| commit | aae637d37ea1e9b362c6f5202a3eda6a0856df75 (patch) | |
| tree | 5a50866c863859bc230bfe57d86b8237247a75f2 /src/3rdparty/libtiff/libtiff/tif_win32.c | |
| parent | 78dae6abac3909e138848c2a25495d5e893ed65a (diff) | |
Update bundled libtiff to version 4.0.8+
This updates the bundled libtiff to release 4.0.8. In addition, since
after that release a number of security-related fixes has been added
to the upstream CVS repository, this commit comprises the upstream
changes of libtiff until 2017-10-10. (Corresponds to commit 46195f7
in the unofficial mirror at github.com/vadz/libtiff.git.)
[ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.0.8+
Change-Id: I9f45387ab48383ef2635d60aeda5c74828f1a6fc
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_win32.c')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_win32.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_win32.c b/src/3rdparty/libtiff/libtiff/tif_win32.c index fdc2ee6..ea40163 100644 --- a/src/3rdparty/libtiff/libtiff/tif_win32.c +++ b/src/3rdparty/libtiff/libtiff/tif_win32.c @@ -1,4 +1,4 @@ -/* $Id: tif_win32.c,v 1.41 2015-08-23 20:12:44 bfriesen Exp $ */ +/* $Id: tif_win32.c,v 1.42 2017-01-11 19:02:49 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -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) { |