From ea9ea45db9ae60a0e100340257232822974df93e Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pavel.zhukov@huawei.com>
Date: Sun, 17 Jul 2022 21:44:40 +0200
Subject: [PATCH] harfbuzz: Fix compilation with clang
Fix for CVE-2022-33068 brings a regression in clang builds.
Fixes in upstream with fixup commit.
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
---
...613e8f825508afa9a0b54d33085557c37441.patch | 26 +++++++++++++++++++
.../harfbuzz/harfbuzz_%.bbappend | 6 +++++
2 files changed, 32 insertions(+)
create mode 100644 meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz/e421613e8f825508afa9a0b54d33085557c37441.patch
create mode 100644 meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz_%.bbappend
diff --git a/meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz/e421613e8f825508afa9a0b54d33085557c37441.patch b/meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz/e421613e8f825508afa9a0b54d33085557c37441.patch
new file mode 100644
index 00000000..e766397f
--- /dev/null
+++ b/meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz/e421613e8f825508afa9a0b54d33085557c37441.patch
@@ -0,0 +1,26 @@
+From e421613e8f825508afa9a0b54d33085557c37441 Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad@behdad.org>
+Date: Wed, 1 Jun 2022 09:07:57 -0600
+Subject: [PATCH] [sbix] Fix conditional
+
+Signed-off: Pavel Zhukov <pavel.zhukov@huawei.com>
+Upstream-Status: Submitted
+[https://lists.openembedded.org/g/openembedded-core/message/168163]
+
+---
+ src/hb-ot-color-sbix-table.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hb-ot-color-sbix-table.hh b/src/hb-ot-color-sbix-table.hh
+index 6efae43cda..d0e2235fb2 100644
+--- a/src/hb-ot-color-sbix-table.hh
++++ b/src/hb-ot-color-sbix-table.hh
+@@ -298,7 +298,7 @@ struct sbix
+
+ const PNGHeader &png = *blob->as<PNGHeader>();
+
+- if (png.IHDR.height >= 65536 | png.IHDR.width >= 65536)
++ if (png.IHDR.height >= 65536 || png.IHDR.width >= 65536)
+ {
+ hb_blob_destroy (blob);
+ return false;
diff --git a/meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz_%.bbappend b/meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz_%.bbappend
new file mode 100644
index 00000000..a90a4655
--- /dev/null
+++ b/meta-oniro-staging/recipes-graphics/harfbuzz/harfbuzz_%.bbappend
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI:append = " file://e421613e8f825508afa9a0b54d33085557c37441.patch "
--
GitLab