summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--exec/ChangeLog5
-rw-r--r--exec/exec.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/exec/ChangeLog b/exec/ChangeLog
index c27f6da6..c690ef9c 100644
--- a/exec/ChangeLog
+++ b/exec/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-23 Mark Kettenis <kettenis@gnu.org>
+
+ * exec.c (do_exec): Set interp.file to MACH_PORT_NULL before the
+ first `goto out'.
+
2000-03-20 Roland McGrath <roland@baalperazim.frob.com>
* main.c (trivfs_allow_open): Initialize to zero.
diff --git a/exec/exec.c b/exec/exec.c
index a7666edf..085d4c01 100644
--- a/exec/exec.c
+++ b/exec/exec.c
@@ -1379,6 +1379,7 @@ do_exec (file_t file,
/* Here is the main body of the function. */
+ interp.file = MACH_PORT_NULL;
/* Catch this error now, rather than later. */
/* XXX For EXEC_DEFAULTS, this is only an error if one of the user's
@@ -1431,8 +1432,6 @@ do_exec (file_t file,
check_elf_phdr (&e, phdr, &phdr_addr, &phdr_size);
}
- interp.file = MACH_PORT_NULL;
-
if (oldtask == MACH_PORT_NULL)
flags |= EXEC_NEWTASK;