diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-08 00:51:55 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-08 00:51:55 +0000 |
commit | 4c2b10e0d6b966246f4ca71837720df552fbfdca (patch) | |
tree | 3ffeddc032612935f39e4b1f614086758306b1ca /array.c | |
parent | 68c67143b2bf1655bcde6e19bff75a55a9e3f05f (diff) | |
download | ruby-4c2b10e0d6b966246f4ca71837720df552fbfdca.tar.gz |
* array.c (sort_1, sort_2): check for reentered and if elements are
accessible. [ruby-core:16679]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -1442,21 +1442,23 @@ rb_ary_reverse_m(VALUE ary) return rb_ary_reverse(rb_ary_dup(ary)); } -static void +static VALUE check_reentered(VALUE *klass) { if (*klass) { rb_raise(rb_eRuntimeError, "sort! reentered"); } + return Qnil; } static int sort_1(const void *ap, const void *bp, void *dummy) { + VALUE retval = check_reentered(dummy); VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp; - VALUE retval = rb_yield_values(2, a, b); int n; + retval = rb_yield_values(2, a, b); n = rb_cmpint(retval, a, b); check_reentered(dummy); return n; @@ -1465,7 +1467,7 @@ sort_1(const void *ap, const void *bp, void *dummy) static int sort_2(const void *ap, const void *bp, void *dummy) { - VALUE retval; + VALUE retval = check_reentered(dummy); VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp; int n; @@ -1515,6 +1517,8 @@ rb_ary_sort_bang(VALUE ary) RARRAY(ary)->len = RARRAY(tmp)->len; RARRAY(ary)->aux.capa = RARRAY(tmp)->aux.capa; FL_UNSET(ary, ELTS_SHARED); + RARRAY(tmp)->ptr = 0; + RARRAY(tmp)->len = 0; RBASIC(tmp)->klass = RBASIC(ary)->klass; } return ary; |