This is the mail archive of the
cygwin-cvs@cygwin.com
mailing list for the Cygwin project.
[newlib-cygwin] cygwin: Fix crash if env var name starts with non-ASCII char
- From: Corinna Vinschen <corinna at sourceware dot org>
- To: cygwin-cvs at sourceware dot org
- Date: 6 Jun 2017 19:10:28 -0000
- Subject: [newlib-cygwin] cygwin: Fix crash if env var name starts with non-ASCII char
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=7afc1124b6530adc07b63ba691725311fada4012
commit 7afc1124b6530adc07b63ba691725311fada4012
Author: Corinna Vinschen <corinna@vinschen.de>
Date: Tue Jun 6 21:10:23 2017 +0200
cygwin: Fix crash if env var name starts with non-ASCII char
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diff:
---
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 7d90e4f..10ffd68 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);