diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-20 14:23:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-20 14:23:37 +0000 |
| commit | 684eb992146cad24b690073f33b909f47150b841 (patch) | |
| tree | 7bc62d6f06c5e8a8114b56fa78485cb7ec08f26b /libX11/modules/im | |
| parent | 53810445215dc45ae303bc89feb6e0aaf04aa6fa (diff) | |
| parent | 8a191c08ddda2e66fa26f148d6c21959bb08f923 (diff) | |
| download | vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.gz vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.bz2 vcxsrv-684eb992146cad24b690073f33b909f47150b841.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/modules/im')
| -rw-r--r-- | libX11/modules/im/ximcp/imLcPrs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libX11/modules/im/ximcp/imLcPrs.c b/libX11/modules/im/ximcp/imLcPrs.c index f6c42daa8..f5d6f8cd1 100644 --- a/libX11/modules/im/ximcp/imLcPrs.c +++ b/libX11/modules/im/ximcp/imLcPrs.c @@ -321,7 +321,8 @@ TransFileName(Xim im, char *name) l += strlen(home);
break;
case 'L':
- lcCompose = _XlcFileName(im->core.lcd, COMPOSE_FILE);
+ if (lcCompose == NULL)
+ lcCompose = _XlcFileName(im->core.lcd, COMPOSE_FILE);
if (lcCompose)
l += strlen(lcCompose);
break;
@@ -357,7 +358,6 @@ TransFileName(Xim im, char *name) if (lcCompose) {
strcpy(j, lcCompose);
j += strlen(lcCompose);
- Xfree(lcCompose);
}
break;
case 'S':
@@ -371,6 +371,7 @@ TransFileName(Xim im, char *name) }
}
*j = '\0';
+ Xfree(lcCompose);
return ret;
}
|