diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-11 09:26:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-11 09:26:35 +0000 |
| commit | 35b29c19707341bbfa32f7f6136ce09e59cb332c (patch) | |
| tree | a795242657a2b96a463a11774517472fa4c64953 /xorg-server/xkb/ddxList.c | |
| parent | ba6498fea6d935aff0856f9851cb47d5657952fa (diff) | |
| parent | e172c89783326e2378e4793ff31a0f44210c5534 (diff) | |
| download | vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.tar.gz vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.tar.bz2 vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.zip | |
svn merge ^/branches/released .
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 e4e32075b..f23effa97 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
@@ -269,8 +270,7 @@ char tmpname[PATH_MAX]; fclose(in);
unlink(tmpname);
#endif
- if (buf != NULL)
- free(buf);
+ free(buf);
return status;
}
|