Update to 1.45.3
This commit is contained in:
parent
643f315e45
commit
3ff8e1aa28
1
.gitignore
vendored
1
.gitignore
vendored
@ -68,3 +68,4 @@ pango-1.28.1.tar.bz2
|
||||
/pango-1.44.7.tar.xz
|
||||
/pango-1.45.1.tar.xz
|
||||
/pango-1.45.2.tar.xz
|
||||
/pango-1.45.3.tar.xz
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From 8dc76b868af97dfd9456057772d635e0d2f1593b Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
Date: Thu, 18 Jun 2020 18:29:16 -0700
|
||||
Subject: [PATCH] pango_attr_list_splice: return if list->attributes is NULL
|
||||
(#485)
|
||||
|
||||
There seem to be various ways to get into this function with
|
||||
list defined but list->attributes as NULL, so we need to check
|
||||
for that too. Patch inspired by @shlomif , but adjusted to follow
|
||||
the style of the other checks.
|
||||
|
||||
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
||||
---
|
||||
pango/pango-attributes.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
|
||||
index 37443346..a007e6fd 100644
|
||||
--- a/pango/pango-attributes.c
|
||||
+++ b/pango/pango-attributes.c
|
||||
@@ -1763,6 +1763,7 @@ pango_attr_list_splice (PangoAttrList *list,
|
||||
guint upos, ulen;
|
||||
|
||||
g_return_if_fail (list != NULL);
|
||||
+ g_return_if_fail (list->attributes != NULL);
|
||||
g_return_if_fail (other != NULL);
|
||||
g_return_if_fail (pos >= 0);
|
||||
g_return_if_fail (len >= 0);
|
||||
--
|
||||
2.27.0
|
||||
|
||||
12
pango.spec
12
pango.spec
@ -8,18 +8,13 @@
|
||||
%global freetype_version 2.1.5
|
||||
|
||||
Name: pango
|
||||
Version: 1.45.2
|
||||
Release: 2%{?dist}
|
||||
Version: 1.45.3
|
||||
Release: 1%{?dist}
|
||||
Summary: System for layout and rendering of internationalized text
|
||||
|
||||
License: LGPLv2+
|
||||
URL: http://www.pango.org
|
||||
Source0: https://download.gnome.org/sources/%{name}/1.45/%{name}-%{version}.tar.xz
|
||||
# Fix a crash that can be triggered in various ways, including
|
||||
# typing Japanese:
|
||||
# https://gitlab.gnome.org/GNOME/pango/-/issues/485
|
||||
# https://gitlab.gnome.org/GNOME/pango/-/merge_requests/206
|
||||
Patch0: 0001-pango_attr_list_splice-return-if-list-attributes-is-.patch
|
||||
|
||||
BuildRequires: pkgconfig(cairo) >= %{cairo_version}
|
||||
BuildRequires: pkgconfig(freetype2) >= %{freetype_version}
|
||||
@ -133,6 +128,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 22 2020 Adam Williamson <awilliam@redhat.com> - 1.45.3-1
|
||||
- Update to 1.45.3
|
||||
|
||||
* Thu Jun 18 2020 Adam Williamson <awilliam@redhat.com> - 1.45.2-2
|
||||
- Backport MR #206 to fix #485 (crash triggered in various ways)
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (pango-1.45.2.tar.xz) = 776189fe4dffe53dfb633e2f78d81ec21e1e5926bfd2924e6fceac6a0906851baf63bc236fedad98a866222cb569e6618f1d5b42319dc8a769071b4fadd833f0
|
||||
SHA512 (pango-1.45.3.tar.xz) = 3dcaac01d5212c0b86f8f13f5e6db298edbfd98b7096740253a10deaf6a929fc47f78ee3eeaa591e11ed68e7189bab66ec9efbb3693cb28f505ea833ce52342e
|
||||
|
||||
Loading…
Reference in New Issue
Block a user