diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-08 15:05:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-08 15:05:49 +0200 |
| commit | 71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec (patch) | |
| tree | ea689cdd51f395980ddc37dc33781635976f3a16 /libX11/src/FontInfo.c | |
| parent | aec798fb4dc72d616732d0fa711faffaa8cd7590 (diff) | |
| parent | 2acb86c9b086bdb9a3897db0b93820652e07cb59 (diff) | |
| download | vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.tar.gz vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.tar.bz2 vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
apps/xwininfo/xwininfo.c
xorg-server/hw/xwin/glx/indirect.c
Diffstat (limited to 'libX11/src/FontInfo.c')
| -rw-r--r-- | libX11/src/FontInfo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libX11/src/FontInfo.c b/libX11/src/FontInfo.c index 763aafb3d..a2d12c2ec 100644 --- a/libX11/src/FontInfo.c +++ b/libX11/src/FontInfo.c @@ -179,8 +179,8 @@ XFontStruct **info) /* RETURN */ Xfree(flist[j]); if (finfo[j].properties) Xfree(finfo[j].properties); } - if (flist) Xfree(flist); - if (finfo) Xfree(finfo); + Xfree(flist); + Xfree(finfo); clearwire: /* Clear the wire. */ |