aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkb/ddxLoad.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-14 13:15:50 +0000
committermarha <marha@users.sourceforge.net>2010-06-14 13:15:50 +0000
commite2eb44705a8e4886d81b75c12e68aaebe9946439 (patch)
tree00639c4f594cdaf4cb08d30dfdb4d4a4e38bc16c /xorg-server/xkb/ddxLoad.c
parent2dc9ef67a51796a1e25bd31eb58663a8023ddd80 (diff)
parent0cf9b03f4990f61640dc35dfac250f929b57b4ed (diff)
downloadvcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.gz
vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.bz2
vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkb/ddxLoad.c')
-rw-r--r--xorg-server/xkb/ddxLoad.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c
index 6cf8e7ee9..b8fd71776 100644
--- a/xorg-server/xkb/ddxLoad.c
+++ b/xorg-server/xkb/ddxLoad.c
@@ -74,6 +74,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef WIN32
+#define strdup _strdup
+
#include <X11/Xwindows.h>
const char*
Win32TempDir()
@@ -103,7 +105,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 +237,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");