Hello community, here is the log from the commit of package fontconfig for openSUSE:Factory checked in at 2014-02-09 13:17:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fontconfig (Old) and /work/SRC/openSUSE:Factory/.fontconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fontconfig" Changes: -------- --- /work/SRC/openSUSE:Factory/fontconfig/fontconfig.changes 2013-12-08 19:26:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fontconfig.new/fontconfig.changes 2014-02-09 13:17:34.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 31 07:30:10 UTC 2014 - pgaj...@suse.com + +- fix fontconfig crash for special bdf font [bnc#860596] + * added fontconfig-crash-bdf.patch + +------------------------------------------------------------------- New: ---- fontconfig-crash-bdf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontconfig.spec ++++++ --- /var/tmp/diff_new_pack.8ilJ3C/_old 2014-02-09 13:17:35.000000000 +0100 +++ /var/tmp/diff_new_pack.8ilJ3C/_new 2014-02-09 13:17:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package fontconfig # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -77,6 +77,8 @@ # fix submitted upstream Patch2: 0001-Fix-inversion-between-Tinos-and-Cousine-in-the-comme.patch Patch3: 0002-Add-metric-aliases-for-additional-Google-ChromeOS-fo.patch +# upstream patch http://cgit.freedesktop.org/fontconfig/commit/?id=80081555fdffea927a53fce2773cfbe9db4c51f0 +Patch4: fontconfig-crash-bdf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ipa-fonts-config = 003.02 Obsoletes: ipa-fonts-config <= 003.02 @@ -123,6 +125,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 %build # ----- build with automake 1.13 ++++++ fontconfig-crash-bdf.patch ++++++ src/fcfreetype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 80081555fdffea927a53fce2773cfbe9db4c51f0 Author: Akira TAGOH <ak...@tagoh.org> Date: Fri Jan 31 11:10:02 2014 +0900 Fix a crash issue when empty strings are set to the BDF properties Index: src/fcfreetype.c =================================================================== --- src/fcfreetype.c.orig 2013-10-11 05:10:18.000000000 +0200 +++ src/fcfreetype.c 2014-01-31 08:40:43.446021821 +0100 @@ -1586,7 +1586,7 @@ } if (width == -1 && FT_Get_BDF_Property (face, "SETWIDTH_NAME", &prop) == 0 && - prop.type == BDF_PROPERTY_TYPE_ATOM) + prop.type == BDF_PROPERTY_TYPE_ATOM && prop.u.atom != NULL) { width = FcIsWidth ((FcChar8 *) prop.u.atom); if (FcDebug () & FC_DBG_SCANV) @@ -1716,7 +1716,7 @@ /* For PCF fonts, override the computed spacing with the one from the property */ if(FT_Get_BDF_Property(face, "SPACING", &prop) == 0 && - prop.type == BDF_PROPERTY_TYPE_ATOM) { + prop.type == BDF_PROPERTY_TYPE_ATOM && prop.u.atom != NULL) { if(!strcmp(prop.u.atom, "c") || !strcmp(prop.u.atom, "C")) spacing = FC_CHARCELL; else if(!strcmp(prop.u.atom, "m") || !strcmp(prop.u.atom, "M")) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
