rpm/freetype2
SHA256
1
0
Fork 0
forked from pool/freetype2
Code Pull Requests Activity

bsc#1079603 and bsc#1079601

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=132
This commit is contained in:
Fridrich Strba 2018-02-07 09:21:03 +00:00 committed by Git OBS Bridge
parent 6a300ce481
commit a8704536e0
4 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
0001-src-truetype-ttinterp.c-Ins_GETVARIATION-Avoid-NULL-.patch Normal file
View File

@ -0,0 +1,21 @@
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -7532,8 +7532,16 @@
return;
}
- for ( i = 0; i < num_axes; i++ )
- args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */
+ if ( coords )
+ {
+ for ( i = 0; i < num_axes; i++ )
+ args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */
+ }
+ else
+ {
+ for ( i = 0; i < num_axes; i++ )
+ args[i] = 0;
+ }
}

14
0001-truetype-Better-protection-against-invalid-VF-data.patch Normal file
View File

@ -0,0 +1,14 @@
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -2821,8 +2821,9 @@
}
}
- /* return value -1 indicates `no change' */
- if ( !have_diff )
+ /* return value -1 indicates `no change'; */
+ /* we can exit early if `normalizedcoords' is already computed */
+ if ( blend->normalizedcoords && !have_diff )
return -1;
if ( FT_NEW_ARRAY( normalized, mmvar->num_axis ) )

11
freetype2.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Feb 7 09:17:10 UTC 2018 - fstrba@suse.com
- Added patches:
* 0001-src-truetype-ttinterp.c-Ins_GETVARIATION-Avoid-NULL-.patch
+ Upstream fix for bsc#1079603: Avoid NULL reference in
src/truetype/ttinterp.c
* 0001-truetype-Better-protection-against-invalid-VF-data.patch
+ Upstream fix for bsc#1079601: Protection against invalid VF
data
-------------------------------------------------------------------
Wed Jan 10 10:32:25 UTC 2018 - idonmez@suse.com

4
freetype2.spec
View File

@ -33,6 +33,8 @@ Patch0: bugzilla-308961-cmex-workaround.patch
Patch1: don-t-mark-libpng-as-required-library.patch
# PATCH-FIX-UPSTREAM psaux-flex.patch -- Upstream commit cc2f3cdecff5a351e7e8961b9f2e389ab740231a
Patch2: psaux-flex.patch
Patch3: 0001-src-truetype-ttinterp.c-Ins_GETVARIATION-Avoid-NULL-.patch
Patch4: 0001-truetype-Better-protection-against-invalid-VF-data.patch
BuildRequires: gawk
BuildRequires: libbz2-devel
BuildRequires: libpng-devel
@ -85,6 +87,8 @@ It also contains a small tutorial for using that library.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"