kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* enum.c (sort_by_cmp): check if reentered. [ruby-dev:24291]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-07-14 05:04:09 +00:00
parent 75d484a453
commit a594151668
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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 11:08:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org> Sat Jul 14 11:08:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/json/ext/generator/generator.c (check_max_nesting): wrong * ext/json/ext/generator/generator.c (check_max_nesting): wrong

7
enum.c
View file

@ -627,7 +627,11 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
{ {
VALUE a = (*(NODE *const *)ap)->u1.value; VALUE a = (*(NODE *const *)ap)->u1.value;
VALUE b = (*(NODE *const *)bp)->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); 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; RBASIC(ary)->klass = 0;
rb_block_call(obj, id_each, 0, 0, sort_by_i, ary); rb_block_call(obj, id_each, 0, 0, sort_by_i, ary);
if (RARRAY_LEN(ary) > 1) { 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) { if (RBASIC(ary)->klass) {
rb_raise(rb_eRuntimeError, "sort_by reentered"); rb_raise(rb_eRuntimeError, "sort_by reentered");