* enumerator.c (enumerator_init_copy): Take care of

  initialize_copy as well as initialize.

* test/ruby/test_enumerator.rb: Pull in the test suite for
  enumerator from trunk.


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

1 files changed, 6 insertions, 1 deletions

diff --git a/enumerator.c b/enumerator.c
index 8d5061d308..f95d931b62 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -293,7 +293,12 @@ enumerator_init_copy(obj, orig)
     struct enumerator *ptr0, *ptr1;
 
     ptr0 = enumerator_ptr(orig);
-    ptr1 = enumerator_ptr(obj);
+
+    Data_Get_Struct(obj, struct enumerator, ptr1);
+
+    if (!ptr1) {
+	rb_raise(rb_eArgError, "unallocated enumerator");
+    }
 
     ptr1->obj  = ptr0->obj;
     ptr1->meth = ptr0->meth;