From 2ec51ee0d506c90f3afba694e6c502ef3d52e4f8 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 20 Oct 2004 12:47:20 +0000
Subject: * string.c (str_gsub): 	reentrant check.  [ruby-dev:24432]

* backport all SEGV bug fixes from CVS HEAD.  [ruby-dev:24536]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/delegate.rb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'lib/delegate.rb')

diff --git a/lib/delegate.rb b/lib/delegate.rb
index ee574cb02b..20e6b53c2e 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -76,10 +76,14 @@ class SimpleDelegator<Delegator
     @_sd_obj = obj
   end
 
-  def initialize_copy(obj)
+  def clone(obj)
     super
     __setobj__(obj.__getobj__.clone)
   end
+  def dup(obj)
+    super
+    __setobj__(obj.__getobj__.dup)
+  end
 end
 
 # backward compatibility ^_^;;;
@@ -108,9 +112,13 @@ def DelegateClass(superclass)
     def __setobj__(obj)
       @_dc_obj = obj
     end
-    def initialize_copy(obj)
+    def clone(obj)
       super
-    __setobj__(obj.__getobj__.clone)
+      __setobj__(obj.__getobj__.clone)
+    end
+    def dup(obj)
+      super
+      __setobj__(obj.__getobj__.dup)
     end
   }
   for method in methods
-- 
cgit v1.2.3