mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-16 04:09:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

harfbuzz: Fix compilation with clang

Browse Source 
Fixup commit for prevous CVE-2022-33068 fix.

Fixes:
| In file included from ../harfbuzz-4.0.1/src/hb-ot-face.cc:39:
4429| ../harfbuzz-4.0.1/src/hb-ot-color-sbix-table.hh:301:11: error: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical]
4430|       if (png.IHDR.height >= 65536 | png.IHDR.width >= 65536)
4431|           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4432|                                    ||
4433| ../harfbuzz-4.0.1/src/hb-ot-color-sbix-table.hh:301:11: note: cast one or both operands to int to silence this warning
4434| 1 error generated.

(From OE-Core rev: 7505ac6da37ba00d4dad74a0312ca20fc17e64df)

Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Pavel Zhukov
2022-07-17 22:07:18 +02:00
committed by Richard Purdie
parent 702cf1e964
commit c82f38999b
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
meta/recipes-graphics/harfbuzz/harfbuzz/0001-Fix-conditional.patch Normal file
View File

@@ -0,0 +1,25 @@
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: Backport [e421613e8f825508afa9a0b54d33085557c37441]
---
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;

5
meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb
View File

@@ -11,8 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \
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"
SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \
file://CVE-2022-33068.patch \
file://0001-Fix-conditional.patch"
SRC_URI[sha256sum] = "98f68777272db6cd7a3d5152bac75083cd52a26176d87bc04c8b3929d33bce49"
inherit meson pkgconfig lib_package gtk-doc gobject-introspection