summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--process.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a51d566775..27ab610fe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 28 11:11:29 2008 Tanaka Akira <akr@fsij.org>
+
+ * process.c (run_exec_options): don't call FIX2INT for nil.
+
Mon Apr 28 11:11:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* proc.c (method_name): should return symbols instead of strings.
diff --git a/process.c b/process.c
index 590dd62edf..2a38392055 100644
--- a/process.c
+++ b/process.c
@@ -2051,7 +2051,7 @@ run_exec_options(const struct rb_exec_arg *e)
#ifdef HAVE_FORK
obj = rb_ary_entry(options, EXEC_OPTION_CLOSE_OTHERS);
if (obj != Qfalse) {
- rb_close_before_exec(3, FIX2INT(obj), e->redirect_fds);
+ rb_close_before_exec(3, FIXNUM_P(obj) ? FIX2LONG(obj) : 0, e->redirect_fds);
}
#endif