677. Fix a segfault in fontconfig (#A.1450, Keith Packard).

This commit is contained in:
David Dawes 2002-12-21 02:31:53 +00:00
parent 1e341fdfc3
commit 432913ead5
1 changed files with 5 additions and 1 deletions

View File

@ -1,5 +1,5 @@
/* /*
* $XFree86: xc/lib/fontconfig/src/fccfg.c,v 1.22 2002/08/22 18:53:22 keithp Exp $ * $XFree86: xc/lib/fontconfig/src/fccfg.c,v 1.23 2002/08/31 22:17:32 keithp Exp $
* *
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
* *
@ -1141,8 +1141,12 @@ FcConfigSubstituteWithPat (FcConfig *config,
if ((t->kind == FcMatchFont || kind == FcMatchPattern) && if ((t->kind == FcMatchFont || kind == FcMatchPattern) &&
!FcStrCmpIgnoreCase ((FcChar8 *) t->field, !FcStrCmpIgnoreCase ((FcChar8 *) t->field,
(FcChar8 *) e->field)) (FcChar8 *) e->field))
{
if (!st[i].elt)
t = 0;
break; break;
} }
}
switch (e->op) { switch (e->op) {
case FcOpAssign: case FcOpAssign:
/* /*