Alexandre Julliard : ntdll: Check for invalid WINEARCH values.
Alexandre Julliard
julliard at winehq.org
Fri Dec 16 14:01:15 CST 2016
Module: wine
Branch: master
Commit: df3b7958a731378d2a156d363bd9af36b34a9ac1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3b7958a731378d2a156d363bd9af36b34a9ac1
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Dec 16 15:20:18 2016 +0100
ntdll: Check for invalid WINEARCH values.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/server.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c
index 59b9ab9..ec517fc 100644
--- a/dlls/ntdll/server.c
+++ b/dlls/ntdll/server.c
@@ -1375,7 +1375,15 @@ void server_init_process(void)
fatal_perror( "Bad server socket %d", fd_socket );
unsetenv( "WINESERVERSOCKET" );
}
- else fd_socket = server_connect();
+ else
+ {
+ const char *arch = getenv( "WINEARCH" );
+
+ if (arch && strcmp( arch, "win32" ) && strcmp( arch, "win64" ))
+ fatal_error( "WINEARCH set to invalid value '%s', it must be either win32 or win64.\n", arch );
+
+ fd_socket = server_connect();
+ }
/* setup the signal mask */
sigemptyset( &server_block_set );
More information about the wine-cvs
mailing list