Add a `restart-emacs' sanity check

* src/emacs.c (Fkill_emacs): Add a sanity check for argv.

diff --git a/src/emacs.c b/src/emacs.c
index 173e8e8923d6860a609af6bba2763bcd0d906ec9..a16e702ab7b455d1a4ae3a594967ef75e840facc 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2807,6 +2807,10 @@ killed.  */
 
   if (!NILP (restart))
     {
+      /* This is very unlikely, but it's possible to execute a binary
+        (on some systems) with no argv.  */
+      if (initial_argc < 1)
+       error ("No command line arguments known; unable to re-execute Emacs");
       if (execvp (*initial_argv, initial_argv) < 1)
        error ("Unable to re-execute Emacs");
     }