* dcrt0.cc (build_argv): Guard against NULL pointer dereference found by Clang.

2012-07-04 17:30:55 +00:00 · 2012-07-04 17:30:55 +00:00 · ea51d3d425
parent 85b2b14e7a
commit ea51d3d425
2 changed files with 7 additions and 1 deletions
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@ -1,3 +1,8 @@
+2012-07-04  Christopher Faylor  <me.cygwin2012@cgf.cx>
+
+	* dcrt0.cc (build_argv): Guard against NULL pointer dereference found
+	by Clang.
+
 2012-07-04  Christopher Faylor  <me.cygwin2012@cgf.cx>

 	* exceptions.cc (setup_handler): Remove unneeded assignment found by
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@ -353,6 +353,7 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell)
 	}
    }

+  if (argv)
    argv[argc] = NULL;

  debug_printf ("argc %d", argc);