* eval.c (rb_f_require): searches ".rb" and ".so" at the same

  time.  previous behavior (search ".rb", then ".so") has a
  security risk (ruby-bugs#PR140).

* array.c (rb_ary_to_ary): new function to replace internal
  rb_Array(), which never calls to_a, but to_ary (rb_Array() might
  call both). [new]

* regex.c (PUSH_FAILURE_POINT): push option status again.

* regex.c (re_compile_pattern): avoid pushing unnecessary
  option_set.

* eval.c (rb_load): tainted string is OK if wrapped *and*
  $SAFE >= 4.

* eval.c (rb_thread_start_0): should not nail down higher blocks
  before preserving original context (i.e. should not alter
  original context).

* eval.c (proc_yield): new method equivalent to Proc#call but no
  check for number of arguments. [new]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 4 deletions

diff --git a/io.c b/io.c
index 3bcf663aad..ae021f8a4b 100644
--- a/io.c
+++ b/io.c
@@ -3462,10 +3462,8 @@ opt_i_set(val)
     VALUE val;
 {
     if (ruby_inplace_mode) free(ruby_inplace_mode);
-    if (!RTEST(val)) {
-	ruby_inplace_mode = 0;
-	return;
-    }
+    ruby_inplace_mode = 0;
+    if (!RTEST(val)) return;
     StringValue(val);
     ruby_inplace_mode = strdup(RSTRING(val)->ptr);
 }