From 7afc1124b6530adc07b63ba691725311fada4012 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 6 Jun 2017 21:10:23 +0200 Subject: [PATCH] cygwin: Fix crash if env var name starts with non-ASCII char Signed-off-by: Corinna Vinschen --- winsup/cygwin/environ.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc index 7d90e4f01..10ffd689c 100644 --- a/winsup/cygwin/environ.cc +++ b/winsup/cygwin/environ.cc @@ -351,7 +351,7 @@ static const unsigned char conv_start_chars[256] = static inline char match_first_char (const char *s, unsigned char m) { - return conv_start_chars[(unsigned) *s] & m; + return conv_start_chars[*(unsigned char *)s] & m; } struct win_env& @@ -795,7 +795,7 @@ environ_init (char **envp, int envc) } debug_printf ("GetEnvironmentStrings returned %p", rawenv); - lastenviron = envp = win32env_to_cygenv (rawenv, true); + lastenviron = envp = win32env_to_cygenv (rawenv, true); FreeEnvironmentStringsW (rawenv); -- 2.43.5