Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Parag Nemade
eea8921b8e
Resolves:rhbz#2102610 CVE-2022-33068 2022-07-15 16:15:10 +05:30
2 changed files with 40 additions and 1 deletions

View file

@ -0,0 +1,32 @@
From 62e803b36173fd096d7ad460dd1d1db9be542593 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 1 Jun 2022 07:38:21 -0600
Subject: [PATCH 001/363] [sbix] Limit glyph extents
Fixes https://github.com/harfbuzz/harfbuzz/issues/3557
---
src/hb-ot-color-sbix-table.hh | 6 ++++++
test/fuzzing/fonts/sbix-extents.ttf | Bin 0 -> 582 bytes
2 files changed, 6 insertions(+)
create mode 100644 test/fuzzing/fonts/sbix-extents.ttf
diff --git a/src/hb-ot-color-sbix-table.hh b/src/hb-ot-color-sbix-table.hh
index 9741ebd45..6efae43cd 100644
--- a/src/hb-ot-color-sbix-table.hh
+++ b/src/hb-ot-color-sbix-table.hh
@@ -298,6 +298,12 @@ struct sbix
const PNGHeader &png = *blob->as<PNGHeader>();
+ if (png.IHDR.height >= 65536 | png.IHDR.width >= 65536)
+ {
+ hb_blob_destroy (blob);
+ return false;
+ }
+
extents->x_bearing = x_offset;
extents->y_bearing = png.IHDR.height + y_offset;
extents->width = png.IHDR.width;
--
2.36.1

View file

@ -1,12 +1,16 @@
Name: harfbuzz
Version: 4.0.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Text shaping library
License: MIT
URL: https://harfbuzz.github.io/
Source0: https://github.com/harfbuzz/harfbuzz/releases/download/%{version}/harfbuzz-%{version}.tar.xz
# Upstream patch
# https://github.com/harfbuzz/harfbuzz/commit/62e803b36173fd096d7ad460dd1d1db9be542593
Patch0: CVE-2022-33068-sbix-Limit-glyph-extents.patch
BuildRequires: cairo-devel
BuildRequires: freetype-devel
BuildRequires: glib2-devel
@ -88,6 +92,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_libdir}/libharfbuzz-icu.so.*
%changelog
* Fri Jul 15 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.0.0-2
- Resolves:rhbz#2102610 CVE-2022-33068
* Thu Mar 03 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.0.0-1
- Update to 4.0.0 version (#2059806)