diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-26 10:26:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-26 10:26:21 +0200 |
| commit | be8a3ecf0bebc7134452778070cd83b7decf7f71 (patch) | |
| tree | e3a5d81a99754c393062ed811bece6e0787e3767 /fontconfig/src/fcxml.c | |
| parent | 7403278d95051a554e2cbec3fafdde8ce9c6d200 (diff) | |
| parent | 5ee5b91b019005aa27273dff01388a68c12be293 (diff) | |
| download | vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.tar.gz vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.tar.bz2 vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa fontconfig libX11 libxcb libxcb/xcb-proto xkeyboard-config git update 26 Aug 2013
Diffstat (limited to 'fontconfig/src/fcxml.c')
| -rw-r--r-- | fontconfig/src/fcxml.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c index eb8d26ac0..9cb1fb2ba 100644 --- a/fontconfig/src/fcxml.c +++ b/fontconfig/src/fcxml.c @@ -2510,7 +2510,6 @@ FcParseMatch (FcConfigParse *parse) { const FcChar8 *kind_name; FcMatchKind kind; - FcEdit *edit = 0; FcVStack *vstack; FcRule *rule = NULL, *r; @@ -2546,8 +2545,10 @@ FcParseMatch (FcConfigParse *parse) { FcConfigMessage (parse, FcSevereError, "<match target=\"scan\"> cannot edit user-defined object \"%s\"", - FcObjectName(edit->object)); - break; + FcObjectName(vstack->u.edit->object)); + if (rule) + FcRuleDestroy (rule); + return; } r = FcRuleCreate (FcRuleEdit, vstack->u.edit); if (rule) |