diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-03 11:06:38 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-03 11:06:38 +0000 |
commit | c5d1fd68f7c062a03f44e590699e5ff957fe06be (patch) | |
tree | d44f3e94868ec9a728ea67d0966c038c1a388054 /enumerator.c | |
parent | 1434fc3fa86b51a344c0d6176229229b50d87a95 (diff) |
* 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
Diffstat (limited to 'enumerator.c')
-rw-r--r-- | enumerator.c | 7 |
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; |