Petr Gajdos
4de6c0a95e
* added fontconfig-crash-bdf.patch OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=122
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
src/fcfreetype.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
New commits:
|
|
commit 80081555fdffea927a53fce2773cfbe9db4c51f0
|
|
Author: Akira TAGOH <akira@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"))
|