diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | enum.c | 10 |
2 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sat Jul 14 14:04:06 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * enum.c (sort_by_cmp): check if reentered. [ruby-dev:24291] + Sat Jul 14 12:44:14 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org> * test/openssl/test_pkcs7.rb: reverted the previous patch. it should @@ -391,12 +391,17 @@ sort_by_i(i, ary) } static int -sort_by_cmp(aa, bb) +sort_by_cmp(aa, bb, data) NODE **aa, **bb; + void *data; { VALUE a = aa[0]->u1.value; VALUE b = bb[0]->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); } @@ -485,7 +490,8 @@ enum_sort_by(obj) RBASIC(ary)->klass = 0; rb_iterate(rb_each, obj, sort_by_i, ary); if (RARRAY(ary)->len > 1) { - qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE), sort_by_cmp, 0); + qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE), + sort_by_cmp, (void *)ary); } if (RBASIC(ary)->klass) { rb_raise(rb_eRuntimeError, "sort_by reentered"); |