* environ.cc (build_env): Use "kilo"bytes not "mega"bytes. Return immediately

on error.
* spawn.cc (spawn_guts): Set return value to -1 on error from build_env.

winsup/cygwin/ChangeLog

@@ -1,3 +1,10 @@
+2005-09-16  Christopher Faylor  <cgf@timesys.com>
+
+	* environ.cc (build_env): Use "kilo"bytes not "mega"bytes.  Return
+	immediately on error.
+	* spawn.cc (spawn_guts): Set return value to -1 on error from
+	build_env.
+
 2005-09-16  Christopher Faylor  <cgf@timesys.com>
 
 	* environ.cc (build_env): Clear envblock and return NULL on attempt to

winsup/cygwin/environ.cc

@@ -1034,11 +1034,11 @@ build_env (const char * const *envp, char *&envblock, int &envc,
 	    p = *srcp;		/* Don't worry about it */
 
 	  len = strlen (p);
-	  if (len >= 32 * 1024 * 1024)
+	  if (len >= 32 * 1024)
 	    {
 	      free (envblock);
 	      envblock = NULL;
-	      break;
+	      goto out;
 	    }
 	  new_tl += len + 1;	/* Keep running total of block length so far */
 
@@ -1072,6 +1072,7 @@ build_env (const char * const *envp, char *&envblock, int &envc,
 					   of buffer */
     }
 
+out:
   debug_printf ("envp %p, envc %d", newenv, envc);
   return newenv;
 }

winsup/cygwin/spawn.cc

@@ -627,6 +627,7 @@ spawn_guts (const char * prog_arg, const char *const *argv,
   if (!moreinfo->envp || !envblock)
     {
       set_errno (E2BIG);
+      res = -1;
       goto out;
     }
   ciresrv.set (chtype, real_path.iscygexec ());