summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-21 11:42:03 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-21 11:42:03 +0000
commit1f29e8e2baa548bba9e385ebbade2198b4cc3859 (patch)
treef2a3cd8fc4533cf4ca850c37f317357bcb09553d
parent5258f67d179757c9d0e4db115691e6a02d07da48 (diff)
class.c: do nothing if copying self
* class.c (rb_mod_init_copy): do nothing if copying self. [ruby-dev:47989] [Bug #9535] * hash.c (rb_hash_initialize_copy): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--class.c2
-rw-r--r--ext/bigdecimal/bigdecimal.c4
-rw-r--r--ext/json/generator/generator.c1
-rw-r--r--ext/zlib/zlib.c1
-rw-r--r--hash.c2
-rw-r--r--test/ruby/test_hash.rb6
-rw-r--r--test/ruby/test_module.rb11
8 files changed, 32 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9dd67f2..31386ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Feb 21 20:42:01 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * class.c (rb_mod_init_copy): do nothing if copying self.
+ [ruby-dev:47989] [Bug #9535]
+
+ * hash.c (rb_hash_initialize_copy): ditto.
+
Fri Feb 21 16:45:54 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/logger.rb (next_rotate_time, previous_period_end): consider
diff --git a/class.c b/class.c
index 2d5657d..323cf6c 100644
--- a/class.c
+++ b/class.c
@@ -321,7 +321,7 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
if (RB_TYPE_P(clone, T_CLASS)) {
class_init_copy_check(clone, orig);
}
- rb_obj_init_copy(clone, orig);
+ if (!OBJ_INIT_COPY(clone, orig)) return clone;
if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
RBASIC_SET_CLASS(clone, rb_singleton_class_clone(orig));
rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index f33dd82..31479d4 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -2494,7 +2494,9 @@ BigDecimal_initialize_copy(VALUE self, VALUE other)
Real *pv = rb_check_typeddata(self, &BigDecimal_data_type);
Real *x = rb_check_typeddata(other, &BigDecimal_data_type);
- DATA_PTR(self) = VpCopy(pv, x);
+ if (self != other) {
+ DATA_PTR(self) = VpCopy(pv, x);
+ }
return self;
}
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 06509ca..1b9652d 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -965,6 +965,7 @@ static VALUE cState_init_copy(VALUE obj, VALUE orig)
{
JSON_Generator_State *objState, *origState;
+ if (obj == orig) return obj;
Data_Get_Struct(obj, JSON_Generator_State, objState);
Data_Get_Struct(orig, JSON_Generator_State, origState);
if (!objState) rb_raise(rb_eArgError, "unallocated JSON::State");
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index c0f52c2..824dd13 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -1563,6 +1563,7 @@ rb_deflate_init_copy(VALUE self, VALUE orig)
Data_Get_Struct(self, struct zstream, z1);
z2 = get_zstream(orig);
+ if (z1 == z2) return self;
err = deflateCopy(&z1->stream, &z2->stream);
if (err != Z_OK) {
raise_zlib_error(err, 0);
diff --git a/hash.c b/hash.c
index 87438df..ccc0d44 100644
--- a/hash.c
+++ b/hash.c
@@ -1403,6 +1403,8 @@ rb_hash_initialize_copy(VALUE hash, VALUE hash2)
Check_Type(hash2, T_HASH);
+ if (hash == hash2) return hash;
+
ntbl = RHASH(hash)->ntbl;
if (RHASH(hash2)->ntbl) {
if (ntbl) st_free_table(ntbl);
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
index c0745dd..6ef817d 100644
--- a/test/ruby/test_hash.rb
+++ b/test/ruby/test_hash.rb
@@ -108,6 +108,12 @@ class TestHash < Test::Unit::TestCase
assert_empty(h)
end
+ def test_self_initialize_copy
+ h = @cls[1=>2]
+ h.instance_eval {initialize_copy(h)}
+ assert_equal(2, h[1])
+ end
+
def test_dup_will_rehash
set1 = @cls[]
set2 = @cls[set1 => true]
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index 57a01db..5eb0457 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -364,6 +364,17 @@ class TestModule < Test::Unit::TestCase
assert_equal([:MIXIN, :USER], User.constants.sort)
end
+ def test_self_initialize_copy
+ bug9535 = '[ruby-dev:47989] [Bug #9535]'
+ m = Module.new do
+ def foo
+ :ok
+ end
+ initialize_copy(self)
+ end
+ assert_equal(:ok, Object.new.extend(m).foo, bug9535)
+ end
+
def test_dup
bug6454 = '[ruby-core:45132]'