diff --git a/ChangeLog b/ChangeLog
index 2ccadd8376..dd1f08e3d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun  3 19:33:22 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (enumerator_init_copy): Take care of
+	  initialize_copy as well as initialize.
+
 Tue Jun  3 16:06:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (file_expand_path): fix for non-existent files and SFN of
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;