diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2017-06-06 21:10:23 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2017-06-06 21:10:23 +0200 |
| commit | 7afc1124b6530adc07b63ba691725311fada4012 (patch) | |
| tree | 1a3a5a15e306f420fbe68cea6e9e23adeb30ac66 | |
| parent | 41b7ef9e1f6357a382be96341507a460123423df (diff) | |
| download | cygnal-7afc1124b6530adc07b63ba691725311fada4012.tar.gz cygnal-7afc1124b6530adc07b63ba691725311fada4012.tar.bz2 cygnal-7afc1124b6530adc07b63ba691725311fada4012.zip | |
cygwin: Fix crash if env var name starts with non-ASCII char
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/environ.cc | 4 |
1 files 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); |