* parse.y (str_extend): shuould allow interpolation of $-x.

* variable.c (rb_cvar_set): empty iv_tbl may cause infinite loop.

* variable.c (rb_cvar_get): ditto.

* variable.c (cvar_override_check): ditto.

* bignum.c (rb_big_eq): convert Bignum to Float, instead of
  reverse.

* time.c (time_localtime): getting tm should not be prohibited for
  frozen time objects.

* time.c (time_gmtime): ditto.

* version.c (Init_version): freeze RUBY_VERSION,
  RUBY_RELEASE_DATE, and RUBY_PLATFORM.

* file.c (Init_File): freeze File::SEPARATOR, ALT_SEPARATOR and
  PATH_SEPARATOR.

* file.c (rb_stat_cmp): should check operand type before calling
  get_stat().

* eval.c (rb_eval_cmd): should not invoke "call" with a block on
  any occasion.

* numeric.c (fix_aref): idx may be a Bignum.

* numeric.c (num_remainder): a bug in Numeric#remainder.

* eval.c (rb_exec_end_proc): END might be called within END
  block.

* class.c (rb_mod_clone): should not copy class name, since clone
  should remain anonymous.


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

1 files changed, 21 insertions, 18 deletions

diff --git a/variable.c b/variable.c
index bf2c2c918d..fc02f749f7 100644
--- a/variable.c
+++ b/variable.c
@@ -1425,11 +1425,12 @@ cvar_override_check(id, a, b)
 {
     a = RCLASS(a)->super;
     while (a) {
-	if (!RCLASS(a)->iv_tbl) continue;
-	if (st_lookup(RCLASS(a)->iv_tbl,id,0)) {
-	    rb_warning("class variable %s of %s is overridden by %s",
-		       rb_id2name(id), rb_class2name(a),
-		       rb_class2name(b));
+	if (RCLASS(a)->iv_tbl) {
+	    if (st_lookup(RCLASS(a)->iv_tbl,id,0)) {
+		rb_warning("class variable %s of %s is overridden by %s",
+			   rb_id2name(id), rb_class2name(a),
+			   rb_class2name(b));
+	    }
 	}
 	a = RCLASS(a)->super;
     }
@@ -1445,15 +1446,16 @@ rb_cvar_set(klass, id, val)
 
     tmp = klass;
     while (tmp) {
-	if (!RCLASS(tmp)->iv_tbl) continue;
-	if (st_lookup(RCLASS(tmp)->iv_tbl,id,0)) {
-	    if (!OBJ_TAINTED(tmp) && rb_safe_level() >= 4)
-		rb_raise(rb_eSecurityError, "Insecure: can't modify class variable");
-	    st_insert(RCLASS(tmp)->iv_tbl,id,val);
-	    if (ruby_verbose) {
-		cvar_override_check(id, tmp, klass);
+	if (RCLASS(tmp)->iv_tbl) {
+	    if (st_lookup(RCLASS(tmp)->iv_tbl,id,0)) {
+		if (!OBJ_TAINTED(tmp) && rb_safe_level() >= 4)
+		    rb_raise(rb_eSecurityError, "Insecure: can't modify class variable");
+		st_insert(RCLASS(tmp)->iv_tbl,id,val);
+		if (ruby_verbose) {
+		    cvar_override_check(id, tmp, klass);
+		}
+		return;
 	    }
-	    return;
 	}
 	tmp = RCLASS(tmp)->super;
     }
@@ -1500,12 +1502,13 @@ rb_cvar_get(klass, id)
 
     tmp = klass;
     while (tmp) {
-	if (!RCLASS(tmp)->iv_tbl) continue;
-	if (st_lookup(RCLASS(tmp)->iv_tbl,id,&value)) {
-	    if (ruby_verbose) {
-		cvar_override_check(id, tmp, klass);
+	if (RCLASS(tmp)->iv_tbl) {
+	    if (st_lookup(RCLASS(tmp)->iv_tbl,id,&value)) {
+		if (ruby_verbose) {
+		    cvar_override_check(id, tmp, klass);
+		}
+		return value;
 	    }
-	    return value;
 	}
 	tmp = RCLASS(tmp)->super;
     }