external/harfbuzz/1265ff8d990284f04d8768f35b0e20ae5f60daae.patch | 25 ++++++++++ external/harfbuzz/UnpackedTarball_harfbuzz.mk | 1 2 files changed, 26 insertions(+)
New commits: commit 80feea0b8d2a22b43dae6de9832758dff620e929 Author: Michael Stahl <[email protected]> AuthorDate: Thu Feb 19 15:42:07 2026 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Feb 20 12:57:21 2026 +0100 harfbuzz: add patch for CVE-2026-22693 Avoid upgrading to new meson-dependent version. Change-Id: Ic94d15fc969bdc51794d6760303aceef449d3aab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199727 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/external/harfbuzz/1265ff8d990284f04d8768f35b0e20ae5f60daae.patch b/external/harfbuzz/1265ff8d990284f04d8768f35b0e20ae5f60daae.patch new file mode 100644 index 000000000000..81a02d678a59 --- /dev/null +++ b/external/harfbuzz/1265ff8d990284f04d8768f35b0e20ae5f60daae.patch @@ -0,0 +1,25 @@ +From 1265ff8d990284f04d8768f35b0e20ae5f60daae Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod <[email protected]> +Date: Fri, 9 Jan 2026 04:54:42 -0700 +Subject: [PATCH] [cmap] malloc fail test (#5710) + +Fixes https://github.com/harfbuzz/harfbuzz/security/advisories/GHSA-xvjr-f2r9-c7ww +--- + src/hb-ot-cmap-table.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh +index 32f705bb3c5..d08e66edaa2 100644 +--- a/src/hb-ot-cmap-table.hh ++++ b/src/hb-ot-cmap-table.hh +@@ -1670,6 +1670,10 @@ struct SubtableUnicodesCache { + { + SubtableUnicodesCache* cache = + (SubtableUnicodesCache*) hb_malloc (sizeof(SubtableUnicodesCache)); ++ ++ if (unlikely (!cache)) ++ return nullptr; ++ + new (cache) SubtableUnicodesCache (source_table); + return cache; + } diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk index 940c5c133757..c574e95e0cdb 100644 --- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,1)) # https://github.com/harfbuzz/harfbuzz/pull/5389 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ + external/harfbuzz/1265ff8d990284f04d8768f35b0e20ae5f60daae.patch \ external/harfbuzz/tdf159529.patch.0 \ external/harfbuzz/icu_75.patch.0 \ external/harfbuzz/0001-const-up-modifier_combining_marks.patch \
