diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-18 09:53:00 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-18 09:53:00 +0100 |
| commit | b14c3b05e45201bbbbb3a4beba260c3d6ff31003 (patch) | |
| tree | 0c431930528bbc4eedea72763955cf4cb423bb07 /libX11/src | |
| parent | 2baf3a927a61d2a268fa4202683f193fa7ba2d14 (diff) | |
| parent | f51268259621a21d14e40b8a41c5803a5c2ce706 (diff) | |
| download | vcxsrv-b14c3b05e45201bbbbb3a4beba260c3d6ff31003.tar.gz vcxsrv-b14c3b05e45201bbbbb3a4beba260c3d6ff31003.tar.bz2 vcxsrv-b14c3b05e45201bbbbb3a4beba260c3d6ff31003.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update fontconfig libX11 mesa xkeyboard-config 18 Feb 2013
Diffstat (limited to 'libX11/src')
| -rw-r--r-- | libX11/src/FontInfo.c | 13 |
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 *) |