diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-11 08:41:00 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-11 08:41:00 +0000 |
| commit | e172c89783326e2378e4793ff31a0f44210c5534 (patch) | |
| tree | 7faed3d12aa20736af6a18fff1a5745cdf57de46 /xorg-server/xkb/ddxList.c | |
| parent | c3d4371fec1beb5b71d21a90be5db6d32c4c185f (diff) | |
| download | vcxsrv-e172c89783326e2378e4793ff31a0f44210c5534.tar.gz vcxsrv-e172c89783326e2378e4793ff31a0f44210c5534.tar.bz2 vcxsrv-e172c89783326e2378e4793ff31a0f44210c5534.zip | |
xserver git update 11/9/2010
Diffstat (limited to 'xorg-server/xkb/ddxList.c')
| -rw-r--r-- | xorg-server/xkb/ddxList.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/xkb/ddxList.c b/xorg-server/xkb/ddxList.c index ce3445bda..16bca16db 100644 --- a/xorg-server/xkb/ddxList.c +++ b/xorg-server/xkb/ddxList.c @@ -161,6 +161,7 @@ char tmpname[PATH_MAX]; }
if (!in) {
haveDir= FALSE;
+ free(buf);
buf = Xprintf(
"'%s/xkbcomp' '-R%s/%s' -w %ld -l -vlfhpR '%s'" W32_tmparg,
XkbBinDirectory,XkbBaseDirectory,componentDirs[what],(long)
@@ -176,6 +177,7 @@ char tmpname[PATH_MAX]; }
if (!in) {
haveDir= FALSE;
+ free(buf);
buf = Xprintf(
"xkbcomp -R%s -w %ld -l -vlfhpR '%s'" W32_tmparg,
componentDirs[what],(long)
@@ -200,8 +202,7 @@ char tmpname[PATH_MAX]; }
if (!in)
{
- if (buf != NULL)
- free(buf);
+ free(buf);
#ifdef WIN32
unlink(tmpname);
#endif
@@ -264,8 +265,7 @@ char tmpname[PATH_MAX]; fclose(in);
unlink(tmpname);
#endif
- if (buf != NULL)
- free(buf);
+ free(buf);
return status;
}
|