* eval.c (rb_yield_0): no mvalue_to_svalue conversion here.

* eval.c (massign): takes svalue, convert it to mvalue inside.

* eval.c (rb_eval): parameters for yield/return are always
  svalues now.

* eval.c (svalue_to_mvalue): more strict conversion.

* eval.c (mvalue_to_svalue): ditto.

* st.c (new_size): prime hash size enabled.

* ext/socket/socket.c (Init_socket): SO_* constants added.


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

1 files changed, 6 insertions, 2 deletions

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