* environ.cc (build_env): Clear envblock and return NULL on attempt to use env

var > 32K. * spawn.cc (spawn_guts): Set E2BIG if build_env detects an error.
2005-09-16 19:58:12 +00:00
parent 541ea31352
commit e4d981b957
3 changed files with 17 additions and 1 deletions
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -624,6 +624,11 @@ spawn_guts (const char * prog_arg, const char *const *argv,
  cygheap->user.deimpersonate ();

  moreinfo->envp = build_env (envp, envblock, moreinfo->envc, real_path.iscygexec ());
+  if (!moreinfo->envp || !envblock)
+    {
+      set_errno (E2BIG);
+      goto out;
+    }
  ciresrv.set (chtype, real_path.iscygexec ());
  ciresrv.moreinfo = moreinfo;