summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init/ChangeLog5
-rw-r--r--init/init.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/init/ChangeLog b/init/ChangeLog
index 0a816ccc..1d09e488 100644
--- a/init/ChangeLog
+++ b/init/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-21 Marcus Brinkmann <marcus@gnu.org>
+
+ * init.c (process_rc_script): If malloc fails, return ENOMEM.
+ Reported by Igor Khavkine <i_khavki@alcor.concordia.ca>.
+
2000-03-17 Thomas Bushnell, BSG <tb@mit.edu>
* init.c (launch_core_servers): Don't use MOVE_SEND in Hurd RPCs.
diff --git a/init/init.c b/init/init.c
index 51aa581c..986ba1e4 100644
--- a/init/init.c
+++ b/init/init.c
@@ -1318,6 +1318,8 @@ process_rc_script ()
if (do_fastboot)
{
rcargs = malloc (rcargslen = sizeof _PATH_RUNCOM);
+ if (!rcargs)
+ return ENOMEM;
strcpy (rcargs, _PATH_RUNCOM);
}
else