- (dtucker) [openbsd-compat/bsd-cygwin_util.c] Ensure sufficient memory

   allocation when retrieving core Windows environment.  Add CYGWIN variable
   to propagated variables.  Patch from vinschen at redhat.com, ok djm@

diff --git a/ChangeLog b/ChangeLog
index 481e9dfe6d395c93c760feb6a36b6b7da8b87aa6..690fe3ac83a85053a4945de636457239caf272b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
    idea, it is now known as UNSUPPORTED_POSIX_THREADS_HACK.  Attempting to use
    USE_POSIX_THREADS will now generate an error so we don't silently change
    behaviour.  ok djm@
+ - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Ensure sufficient memory
+   allocation when retrieving core Windows environment.  Add CYGWIN variable
+   to propagated variables.  Patch from vinschen at redhat.com, ok djm@
 
 20050524
  - (djm) [openbsd-compat/readpassphrase.c] bz #950: Retry tcsetattr to ensure

diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index eb983def2d5ec7d14ea568c7480cb774c5094786..94f63f1a574f7d241416285752fd2cb52a7719af 100644 (file)
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -247,6 +247,7 @@ static struct wenv {
        { NL("COMMONPROGRAMFILES=") },
        { NL("COMPUTERNAME=") },
        { NL("COMSPEC=") },
+       { NL("CYGWIN=") },
        { NL("NUMBER_OF_PROCESSORS=") },
        { NL("OS=") },
        { NL("PATH=") },
@@ -260,7 +261,7 @@ static struct wenv {
        { NL("SYSTEMROOT=") },
        { NL("TMP=") },
        { NL("TEMP=") },
-       { NL("WINDIR=") },
+       { NL("WINDIR=") }
 };
 
 char **
@@ -269,7 +270,7 @@ fetch_windows_environment(void)
        char **e, **p;
        int i, idx = 0;
 
-       p = xmalloc(WENV_SIZ * sizeof(char *));
+       p = xmalloc((WENV_SIZ + 1) * sizeof(char *));
        for (e = environ; *e != NULL; ++e) {
                for (i = 0; i < WENV_SIZ; ++i) {
                        if (!strncmp(*e, wenv_arr[i].name, wenv_arr[i].namelen))