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

* array.c (rb_ary_sort_bang): should not free shared pointer, and set

Browse source 
shared.  [ruby-dev:34732]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-05-17 05:01:52 +00:00
parent 02838f3508
commit 9afd5465e2
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat May 17 14:01:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_sort_bang): should not free shared pointer, and set
shared. [ruby-dev:34732]
Sat May 17 12:34:54 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* thread_pthread.c (Init_native_thread): Kernel#.sleep used never to

3
array.c
View file

@ -1514,10 +1514,11 @@ rb_ary_sort_bang(VALUE ary)
ruby_qsort(RARRAY_PTR(tmp), RARRAY_LEN(tmp), sizeof(VALUE),
rb_block_given_p()?sort_1:sort_2, &RBASIC(tmp)->klass);
if (RARRAY(ary)->ptr != RARRAY(tmp)->ptr) {
xfree(RARRAY(ary)->ptr);
if (!ARY_SHARED_P(ary)) xfree(RARRAY(ary)->ptr);
RARRAY(ary)->ptr = RARRAY(tmp)->ptr;
RARRAY(ary)->len = RARRAY(tmp)->len;
RARRAY(ary)->aux.capa = RARRAY(tmp)->aux.capa;
FL_SET(ary, ELTS_SHARED);
};
FL_UNSET(ary, ELTS_SHARED);
RARRAY(tmp)->ptr = 0;

10
test/ruby/test_array.rb
View file

@ -1152,6 +1152,16 @@ class TestArray < Test::Unit::TestCase
assert_match(/reentered/, e.message, '[ruby-core:16679]')
end
def test_sort_with_replace
xary = (1..100).to_a
100.times do
ary = (1..100).to_a
ary.sort! {|a,b| ary.replace(xary); a <=> b}
GC.start
assert_equal(xary, ary, '[ruby-dev:34732]')
end
end
def test_to_a
a = @cls[ 1, 2, 3 ]
a_id = a.__id__