about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--hurd/hurdexec.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/hurd/hurdexec.c b/hurd/hurdexec.c
index 83e44081f5..fa35ce7d1b 100644
--- a/hurd/hurdexec.c
+++ b/hurd/hurdexec.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,96,97,99 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -49,8 +49,12 @@ _hurd_exec (task_t task, file_t file,
   mach_port_t *please_dealloc, *pdp;
 
   /* XXX needs to be hurdmalloc XXX */
-  if (err = __argz_create (argv, &args, &argslen))
+  if (argv == NULL)
+    args = NULL, argslen = 0;
+  else if (err = __argz_create (argv, &args, &argslen))
     return err;
+  if (envp == NULL)
+    env = NULL, envlen = 0;
   if (err = __argz_create (envp, &env, &envlen))
     goto outargs;