From: Wentao Zhang <wentao.zhang@windriver.com>
To: openembedded-core@lists.openembedded.org
Subject: [oe-core][kirkstone][PATCH] harfbuzz: Fix conditional
Date: Mon, 18 Jul 2022 01:32:04 -0700 [thread overview]
Message-ID: <20220718083204.6069-1-wentao.zhang@windriver.com> (raw)
From: Wentao Zhang <wzhang4@ala-lpd-susbld2.wrs.com>
Backport patch from
https://github.com/harfbuzz/harfbuzz/commit/e421613e8f825508afa9a0b54d33085557c37441
Signed-off-by: Wentao Zhang <wzhang4@ala-lpd-susbld2.wrs.com>
---
.../harfbuzz/harfbuzz/Fix-conditional.patch | 27 +++++++++++++++++++
.../harfbuzz/harfbuzz_4.0.1.bb | 3 ++-
2 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz/Fix-conditional.patch
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/Fix-conditional.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/Fix-conditional.patch
new file mode 100644
index 0000000000..ed2b606c00
--- /dev/null
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz/Fix-conditional.patch
@@ -0,0 +1,27 @@
+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
+
+Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/e421613e8f825508afa9a0b54d33085557c37441]
+Signed-off-by: Wentao Zhang<Wentao.Zhang@windriver.com>
+---
+ 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 6efae43cd..d0e2235fb 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;
+--
+2.34.1
+
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb
index 81518a53ea..54ac194eae 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb
@@ -12,7 +12,8 @@ UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar"
SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz\
- file://CVE-2022-33068.patch"
+ file://CVE-2022-33068.patch\
+ file://Fix-conditional.patch"
SRC_URI[sha256sum] = "98f68777272db6cd7a3d5152bac75083cd52a26176d87bc04c8b3929d33bce49"
inherit meson pkgconfig lib_package gtk-doc gobject-introspection
--
2.34.1
reply other threads:[~2022-07-18 8:32 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220718083204.6069-1-wentao.zhang@windriver.com \
--to=wentao.zhang@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox