diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-14 12:29:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-14 12:29:39 +0000 |
| commit | 0cf9b03f4990f61640dc35dfac250f929b57b4ed (patch) | |
| tree | f4a96a254237696f58d46c150c12f289e5a15701 /xorg-server/xkb/ddxLoad.c | |
| parent | ea5824c767121c3c97f587a9dfb63a87b442032b (diff) | |
| download | vcxsrv-0cf9b03f4990f61640dc35dfac250f929b57b4ed.tar.gz vcxsrv-0cf9b03f4990f61640dc35dfac250f929b57b4ed.tar.bz2 vcxsrv-0cf9b03f4990f61640dc35dfac250f929b57b4ed.zip | |
xserver git update 14/6/2010
Diffstat (limited to 'xorg-server/xkb/ddxLoad.c')
| -rw-r--r-- | xorg-server/xkb/ddxLoad.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c index 32125015f..6742537e7 100644 --- a/xorg-server/xkb/ddxLoad.c +++ b/xorg-server/xkb/ddxLoad.c @@ -103,7 +103,7 @@ Win32System(const char *cmdline) STARTUPINFO si;
PROCESS_INFORMATION pi;
DWORD dwExitCode;
- char *cmd = xstrdup(cmdline);
+ char *cmd = strdup(cmdline);
ZeroMemory( &si, sizeof(si) );
si.cb = sizeof(si);
@@ -235,6 +235,11 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb, xkm_output_dir, keymap);
free(xkbbasedirflag);
+
+ if (!buf) {
+ LogMessage(X_ERROR, "XKB: Could not invoke xkbcomp: not enough memory\n");
+ return FALSE;
+ }
#ifndef WIN32
out= Popen(buf,"w");
|