990201

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

1 files changed, 3 insertions, 3 deletions

diff --git a/hash.c b/hash.c
index 1dc62885d8..32d7379fab 100644
--- a/hash.c
+++ b/hash.c
@@ -34,7 +34,7 @@ rb_hash_modify(hash)
 {
     if (FL_TEST(hash, HASH_FREEZE))
 	rb_raise(rb_eTypeError, "can't modify frozen hash");
-    if (rb_safe_level() >= 4 && !FL_TEST(hash, FL_TAINT))
+    if (!FL_TEST(hash, FL_TAINT) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: can't modify hash");
 }
 
@@ -459,7 +459,7 @@ delete_if_i(key, value)
     VALUE key, value;
 {
     if (key == Qnil) return ST_CONTINUE;
-    if (rb_yield(rb_assoc_new(key, value)))
+    if (RTEST(rb_yield(rb_assoc_new(key, value))))
 	return ST_DELETE;
     return ST_CONTINUE;
 }
@@ -1115,7 +1115,7 @@ rb_f_setenv(obj, nm, val)
     }
 
     name = str2cstr(nm, &nlen);
-    value = STR2CSTR(val &vlen);
+    value = str2cstr(val, &vlen);
     if (strlen(name) != nlen)
 	rb_raise(rb_eArgError, "Bad environment name");
     if (strlen(value) != vlen)