Skip to content
Snippets Groups Projects
Commit 3aabcde5 authored by Pavel Zhukov's avatar Pavel Zhukov
Browse files

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: default avatarPavel Zhukov <pavel.zhukov@huawei.com>
parent ae2803eb
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !197. Comments created here will be created in the context of that merge request.
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;
# SPDX-FileCopyrightText: Huawei Inc.
# SPDX-License-Identifier: Apache-2.0
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI:append = " file://e421613e8f825508afa9a0b54d33085557c37441.patch "
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment