From bc81a19e99ab99d4a1d8e4cedce3fbf87c52bda4 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 8 Jun 2012 02:25:55 +0000 Subject: ext/pty/pty.c: status to protect * ext/pty/pty.c (establishShell): now needs status to protect from exceptions in rb_fork_err(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/pty/pty.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e44795f10..7342c2c3a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jun 8 11:25:51 2012 Nobuyoshi Nakada + + * ext/pty/pty.c (establishShell): now needs status to protect from + exceptions in rb_fork_err(). + Thu Jun 7 22:13:05 2012 Tanaka Akira * process.c (rb_fork_err): Fix the conditoin to use rb_protect. diff --git a/ext/pty/pty.c b/ext/pty/pty.c index 06d4075726..be87c3701b 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -155,7 +155,7 @@ static void establishShell(int argc, VALUE *argv, struct pty_info *info, char SlaveName[DEVICELEN]) { - int master,slave; + int master, slave, status = 0; rb_pid_t pid; char *p, *getenv(); struct passwd *pwent; @@ -189,7 +189,7 @@ establishShell(int argc, VALUE *argv, struct pty_info *info, carg.argc = argc; carg.argv = argv; errbuf[0] = '\0'; - pid = rb_fork_err(0, chfunc, &carg, Qnil, errbuf, sizeof(errbuf)); + pid = rb_fork_err(&status, chfunc, &carg, Qnil, errbuf, sizeof(errbuf)); if (pid < 0) { int e = errno; -- cgit v1.2.3