diff options
author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2018-10-11 15:26:14 +0200 |
---|---|---|
committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2018-10-12 07:51:09 +0000 |
commit | 80017a1c7f829355edce61d5d50196cd1e13dcdd (patch) | |
tree | 94723739a2e1b2722d2a11ab208f157b5733ebbf /src/3rdparty/libtiff/libtiff/tif_dirwrite.c | |
parent | 855106d17258638cf50099b47d2db801c747ebb6 (diff) | |
download | qtimageformats-80017a1c7f829355edce61d5d50196cd1e13dcdd.tar.gz |
Bundled libtiff: add a number of security-related upstream patches
This comprises the following libtiff commits, related to the listed
CVEs:
3719385a3fac5cfb20b487619a5f08abbf967cf8 CVE-2017-11613
7a092f8af2568d61993a8cc2e7a35a998d7d37be CVE-2017-11613
de144fd228e4be8aa484c3caf3d814b6fa88c6d9 CVE-2018-10963
58a898cb4459055bb488ca815c23b880c242a27d CVE-2018-8905
981e43ecae83935625c86c9118c0778c942c7048 CVE-2018-10779
[ChangeLog][TIFF] A number of security-related upstream patches has
been applied to the bundled libtiff
Change-Id: I3def9a9b91d0dd2cfd959c5e83d972beed9394d6
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_dirwrite.c')
-rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_dirwrite.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_dirwrite.c b/src/3rdparty/libtiff/libtiff/tif_dirwrite.c index c68d6d2..5d0a669 100644 --- a/src/3rdparty/libtiff/libtiff/tif_dirwrite.c +++ b/src/3rdparty/libtiff/libtiff/tif_dirwrite.c @@ -697,8 +697,11 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64* pdiroff) } break; default: - assert(0); /* we should never get here */ - break; + TIFFErrorExt(tif->tif_clientdata,module, + "Cannot write tag %d (%s)", + TIFFFieldTag(o), + o->field_name ? o->field_name : "unknown"); + goto bad; } } } |