From a5941516685eac751193ea88424be5588698b2c7 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 14 Jul 2007 05:04:09 +0000 Subject: * enum.c (sort_by_cmp): check if reentered. [ruby-dev:24291] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enum.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'enum.c') diff --git a/enum.c b/enum.c index 1cde4145ff..a93b171c08 100644 --- a/enum.c +++ b/enum.c @@ -627,7 +627,11 @@ sort_by_cmp(const void *ap, const void *bp, void *data) { VALUE a = (*(NODE *const *)ap)->u1.value; VALUE b = (*(NODE *const *)bp)->u1.value; + VALUE ary = (VALUE)data; + if (RBASIC(ary)->klass) { + rb_raise(rb_eRuntimeError, "sort_by reentered"); + } return rb_cmpint(rb_funcall(a, id_cmp, 1, b), a, b); } @@ -717,7 +721,8 @@ enum_sort_by(VALUE obj) RBASIC(ary)->klass = 0; rb_block_call(obj, id_each, 0, 0, sort_by_i, ary); if (RARRAY_LEN(ary) > 1) { - ruby_qsort(RARRAY_PTR(ary), RARRAY_LEN(ary), sizeof(VALUE), sort_by_cmp, 0); + ruby_qsort(RARRAY_PTR(ary), RARRAY_LEN(ary), sizeof(VALUE), + sort_by_cmp, (void *)ary); } if (RBASIC(ary)->klass) { rb_raise(rb_eRuntimeError, "sort_by reentered"); -- cgit v1.2.3