summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-28 02:13:24 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-28 02:13:24 +0000
commitfea86e4a1bcd7772513e7a0f993ea663bdc34f2b (patch)
tree2db2be27dd44abd411c437ab149d0e0e4987e9f3
parent2b0dee5cb639b23fc59690c214acaa40b43380b2 (diff)
downloadruby-fea86e4a1bcd7772513e7a0f993ea663bdc34f2b.tar.gz
ruby-fea86e4a1bcd7772513e7a0f993ea663bdc34f2b.tar.xz
ruby-fea86e4a1bcd7772513e7a0f993ea663bdc34f2b.zip
* process.c (run_exec_options): don't call FIX2INT for nil.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--process.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a51d56677..27ab610fe 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 590dd62ed..2a3839205 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