aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/FontInfo.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-18 09:48:46 +0100
committermarha <marha@users.sourceforge.net>2013-02-18 09:48:46 +0100
commitf51268259621a21d14e40b8a41c5803a5c2ce706 (patch)
tree50731770e341e8cd29a37e412ff469eba1037279 /libX11/src/FontInfo.c
parent6f6a2340d40759b77ef43965efdd24f3e4e623fd (diff)
downloadvcxsrv-f51268259621a21d14e40b8a41c5803a5c2ce706.tar.gz
vcxsrv-f51268259621a21d14e40b8a41c5803a5c2ce706.tar.bz2
vcxsrv-f51268259621a21d14e40b8a41c5803a5c2ce706.zip
git update fontconfig libX11 mesa xkeyboard-config 18 Feb 2013
xkeyboard-config commit 5102e074fea319c10243579955b64366f11009fd libX11 commit deedeada53676ee529d700bf96fde0b29a3a1def fontconfig commit 2c696255749683e9a084f797eb033d222510a275 mesa commit dd599188d2868838541859a76800a8420958d358
Diffstat (limited to 'libX11/src/FontInfo.c')
-rw-r--r--libX11/src/FontInfo.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/libX11/src/FontInfo.c b/libX11/src/FontInfo.c
index a3ab65be5..97de40e0e 100644
--- a/libX11/src/FontInfo.c
+++ b/libX11/src/FontInfo.c
@@ -90,6 +90,11 @@ XFontStruct **info) /* RETURN */
Xrealloc ((char *) flist,
(unsigned) (sizeof(char *) * (size+1)));
+ if (tmp_finfo)
+ finfo = tmp_finfo;
+ if (tmp_flist)
+ flist = tmp_flist;
+
if ((! tmp_finfo) || (! tmp_flist)) {
/* free all the memory that we allocated */
for (j=(i-1); (j >= 0); j--) {
@@ -97,14 +102,10 @@ XFontStruct **info) /* RETURN */
if (finfo[j].properties)
Xfree((char *) finfo[j].properties);
}
- if (tmp_flist) Xfree((char *) tmp_flist);
- else Xfree((char *) flist);
- if (tmp_finfo) Xfree((char *) tmp_finfo);
- else Xfree((char *) finfo);
+ Xfree((char *) flist);
+ Xfree((char *) finfo);
goto clearwire;
}
- finfo = tmp_finfo;
- flist = tmp_flist;
}
else {
if (! (finfo = (XFontStruct *)