summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-09-28 04:21:31 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-09-28 04:21:31 +0000
commit4d23d9e7d8bda4f1231b5696a714fee735cdad90 (patch)
tree494addc0fd35877a3d10f9ef20862865b1a175e4
parent70dc199fdde6a70205410e0a8cfe4aff4c50344f (diff)
* hash.c (rb_hash_become): should check self-assignment after
conversion. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--hash.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a4b08b8..f0dd3a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 28 13:19:29 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+
+ * hash.c (rb_hash_become): should check self-assignment after
+ conversion.
+
Sat Sep 28 10:40:44 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (rb_hash_become): Hash#become should check added
diff --git a/hash.c b/hash.c
index 6e1c247..69ca1db 100644
--- a/hash.c
+++ b/hash.c
@@ -575,8 +575,8 @@ static VALUE
rb_hash_become(hash, hash2)
VALUE hash, hash2;
{
- if (hash == hash2) return hash;
hash2 = to_hash(hash2);
+ if (hash == hash2) return hash;
rb_hash_clear(hash);
st_foreach(RHASH(hash2)->tbl, replace_i, hash);
RHASH(hash)->ifnone = RHASH(hash2)->ifnone;