summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-06-03 14:09:11 +0100
committerCaolán McNamara <caolanm@redhat.com>2022-06-03 18:03:12 +0200
commit4c3b44fd1e4473ba3e4bd02042849bd0cd876915 (patch)
tree750d9659f258804328b595d6f0293833731211c4 /external
parent6079bf6879c4baf144b68ef459d825412ecea697 (diff)
upgrade libtiff to 4.4.0
dropping ubsan.patch which was fixed upstream in this release Change-Id: Ic2e35b24f7a9c7c3e2a00da8bc5b5b7d500746fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135359 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/libtiff/UnpackedTarball_libtiff.mk1
-rw-r--r--external/libtiff/ubsan.patch11
2 files changed, 0 insertions, 12 deletions
diff --git a/external/libtiff/UnpackedTarball_libtiff.mk b/external/libtiff/UnpackedTarball_libtiff.mk
index f874d6d61743..ee3d4ab6cb27 100644
--- a/external/libtiff/UnpackedTarball_libtiff.mk
+++ b/external/libtiff/UnpackedTarball_libtiff.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libtiff,0))
$(eval $(call gb_UnpackedTarball_add_patches,libtiff,\
external/libtiff/libtiff.linknolibs.patch \
external/libtiff/libtiff.16bitcielab.patch \
- external/libtiff/ubsan.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libtiff/ubsan.patch b/external/libtiff/ubsan.patch
deleted file mode 100644
index 853d069ad795..000000000000
--- a/external/libtiff/ubsan.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtiff/tif_dirread.c
-+++ libtiff/tif_dirread.c
-@@ -4173,7 +4173,7 @@
- goto bad;
- }
-
-- memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16_t));
-+ if (old_extrasamples != 0) memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16_t));
- _TIFFsetShortArray(&tif->tif_dir.td_sampleinfo, new_sampleinfo, tif->tif_dir.td_extrasamples);
- _TIFFfree(new_sampleinfo);
- }