mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

(scm_system_star): Fix execargv memory leak, merge parent

Browse source 
and fork error cases to do this.
This commit is contained in:
Kevin Ryde 2004-04-05 22:45:17 +00:00
parent dec40cd262
commit eac8e0ef86
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
libguile/simpos.c
View file

@ -1,4 +1,4 @@
/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003 Free Software
/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003, 2004 Free Software
* Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
@ -158,12 +158,26 @@ SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
oldquit = scm_sigaction (sigquit, sig_ign, SCM_UNDEFINED);
pid = fork ();
if (pid == -1)
SCM_SYSERROR;
else if (pid)
if (pid == 0)
{
int wait_result;
int status;
/* child */
execvp (SCM_STRING_CHARS (SCM_CAR (args)), execargv);
scm_remember_upto_here_1 (args);
SCM_SYSERROR;
/* not reached. */
return SCM_BOOL_F;
}
else
{
/* parent */
int wait_result, status, save_errno;
save_errno = errno;
free (execargv);
errno = save_errno;
if (pid == -1)
SCM_SYSERROR;
SCM_SYSCALL (wait_result = waitpid (pid, &status, 0));
if (wait_result == -1) SCM_SYSERROR;
scm_sigaction (sigint, SCM_CAR (oldint), SCM_CDR (oldint));
@ -171,14 +185,6 @@ SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
scm_remember_upto_here_2 (oldint, oldquit);
return SCM_MAKINUM (0L + status);
}
else
{
execvp (SCM_STRING_CHARS (SCM_CAR (args)), execargv);
scm_remember_upto_here_1 (args);
SCM_SYSERROR;
/* not reached. */
return SCM_BOOL_F;
}
}
else
SCM_WRONG_TYPE_ARG (1, SCM_CAR (args));