summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libtiff/libtiff/tif_stream.cxx
diff options
context:
space:
mode:
authorEirik Aavitsland <eirik.aavitsland@qt.io>2018-11-16 15:01:08 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2018-11-19 12:34:27 +0000
commit43403038cf75086409bf7ee485ae855fd4c1c1e1 (patch)
treeea10eae91b39fd075491dfa5f8522e1ded50d7a1 /src/3rdparty/libtiff/libtiff/tif_stream.cxx
parent0c8d172cf34f442a1318388f751d7e0f652d7072 (diff)
Update bundled libtiff to version 4.0.10
[ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.0.10 Change-Id: Ib1908d09fc5847381cb03418de878fafd2001a30 Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_stream.cxx')
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_stream.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_stream.cxx b/src/3rdparty/libtiff/libtiff/tif_stream.cxx
index ecca1fd..7f640a9 100644
--- a/src/3rdparty/libtiff/libtiff/tif_stream.cxx
+++ b/src/3rdparty/libtiff/libtiff/tif_stream.cxx
@@ -1,5 +1,3 @@
-/* $Id: tif_stream.cxx,v 1.13 2015-05-28 01:50:22 bfriesen Exp $ */
-
/*
* Copyright (c) 1988-1996 Sam Leffler
* Copyright (c) 1991-1996 Silicon Graphics, Inc.
@@ -375,6 +373,9 @@ _tiffStreamOpen(const char* name, const char* mode, void *fd)
_tiffosSizeProc,
_tiffDummyMapProc,
_tiffDummyUnmapProc);
+ if (!tif) {
+ delete data;
+ }
} else {
tiffis_data *data = new tiffis_data;
data->stream = reinterpret_cast<istream *>(fd);
@@ -389,6 +390,9 @@ _tiffStreamOpen(const char* name, const char* mode, void *fd)
_tiffisSizeProc,
_tiffDummyMapProc,
_tiffDummyUnmapProc);
+ if (!tif) {
+ delete data;
+ }
}
return (tif);