diff options
| author | David Dawes <dawes@xfree86.org> | 2002-12-21 02:31:53 +0000 |
|---|---|---|
| committer | David Dawes <dawes@xfree86.org> | 2002-12-21 02:31:53 +0000 |
| commit | 432913ead584d164ed2830958ca5a3846394f5e6 (patch) | |
| tree | 88b45c372cbf1c9799f0c0294572c4bec0653756 | |
| parent | 1e341fdfc38527d8614e2fe744237f473f3febee (diff) | |
677. Fix a segfault in fontconfig (#A.1450, Keith Packard).xf-4_2_99_3
| -rw-r--r-- | src/fccfg.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/fccfg.c b/src/fccfg.c index 8442f80a..446004f2 100644 --- a/src/fccfg.c +++ b/src/fccfg.c @@ -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. * @@ -1141,7 +1141,11 @@ FcConfigSubstituteWithPat (FcConfig *config, if ((t->kind == FcMatchFont || kind == FcMatchPattern) && !FcStrCmpIgnoreCase ((FcChar8 *) t->field, (FcChar8 *) e->field)) + { + if (!st[i].elt) + t = 0; break; + } } switch (e->op) { case FcOpAssign: |