X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/b54ffe0570eb693d6debb50e420cda55d727744b..df3d74568a92951341f3be036c199490f5e6d13f:/openbsd-compat/bsd-cygwin_util.c

diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index 94f63f1a..b408dde2 100644
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -29,8 +29,6 @@
 
 #include "includes.h"
 
-RCSID("$Id$");
-
 #ifdef HAVE_CYGWIN
 
 #include <fcntl.h>
@@ -268,9 +266,9 @@ char **
 fetch_windows_environment(void)
 {
 	char **e, **p;
-	int i, idx = 0;
+	unsigned int i, idx = 0;
 
-	p = xmalloc((WENV_SIZ + 1) * sizeof(char *));
+	p = xcalloc(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))