- (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@

1 files changed, 4 insertions, 3 deletions

diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index f53abb6e2..b5e3cc52b 100644
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -29,7 +29,7 @@
 
 #include "includes.h"
 
-RCSID("$Id: bsd-cygwin_util.c,v 1.13 2004/08/30 10:42:08 dtucker Exp $");
+RCSID("$Id: bsd-cygwin_util.c,v 1.14 2005/05/25 09:42:11 dtucker Exp $");
 
 #ifdef HAVE_CYGWIN
 
@@ -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))