aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-07-09 11:32:22 +0200
committermarha <marha@users.sourceforge.net>2013-07-09 11:32:22 +0200
commitf8f0209a691e0d0838d1ef9d602ebacafee2a233 (patch)
tree591285bbfdecaf92be8bb3fd2291f9f17bc2c822 /fontconfig/src
parentecf91092594b6cd72548f6a675515e84516398ff (diff)
parentc6069c33e3a4a6d48aa059dbe9a78702dabff9cc (diff)
downloadvcxsrv-f8f0209a691e0d0838d1ef9d602ebacafee2a233.tar.gz
vcxsrv-f8f0209a691e0d0838d1ef9d602ebacafee2a233.tar.bz2
vcxsrv-f8f0209a691e0d0838d1ef9d602ebacafee2a233.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig libX11 libxcb mesa git update 9 Jul 2013
Diffstat (limited to 'fontconfig/src')
-rw-r--r--fontconfig/src/fcxml.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c
index 2f3ccacab..1cac9a8b3 100644
--- a/fontconfig/src/fcxml.c
+++ b/fontconfig/src/fcxml.c
@@ -69,8 +69,8 @@ FcTestDestroy (FcTest *test)
void
FcRuleDestroy (FcRule *rule)
{
- if (rule->next)
- FcRuleDestroy (rule->next);
+ FcRule *n = rule->next;
+
switch (rule->type) {
case FcRuleTest:
FcTestDestroy (rule->u.test);
@@ -82,6 +82,8 @@ FcRuleDestroy (FcRule *rule)
break;
}
free (rule);
+ if (n)
+ FcRuleDestroy (n);
}
static FcExpr *