1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* array.c (rb_ary_count): check length to avoid SEGV

Browse Source 
while iterating. Remove other pointer loop when arg is given.
* test/ruby/test_array.rb (test_count): add test for bug.
  [ruby-core:56072] [Bug #8654]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eregon 2013-07-18 11:38:01 +00:00
parent 6f49bc635b
commit e1335a307c
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Thu Jul 18 20:35:14 2013 Benoit Daloze <eregontp@gmail.com>
* array.c (rb_ary_count): check length to avoid SEGV
while iterating. Remove other pointer loop when arg is given.
* test/ruby/test_array.rb (test_count): add test for bug.
[ruby-core:56072] [Bug #8654]
Thu Jul 18 18:14:36 2013 Masaki Matsushita <glass.saga@gmail.com> Thu Jul 18 18:14:36 2013 Masaki Matsushita <glass.saga@gmail.com>
* array.c (rb_ary_count): iterate items appropriately. * array.c (rb_ary_count): iterate items appropriately.

9
array.c
View File

@ -4174,10 +4174,9 @@ rb_ary_compact(VALUE ary)
static VALUE static VALUE
rb_ary_count(int argc, VALUE *argv, VALUE ary) rb_ary_count(int argc, VALUE *argv, VALUE ary)
{ {
long n = 0; long i, n = 0;
if (argc == 0) { if (argc == 0) {
long i;
VALUE v; VALUE v;
if (!rb_block_given_p()) if (!rb_block_given_p())
@ -4189,14 +4188,14 @@ rb_ary_count(int argc, VALUE *argv, VALUE ary)
} }
} }
else { else {
VALUE obj, *p, *pend; VALUE obj;
rb_scan_args(argc, argv, "1", &obj); rb_scan_args(argc, argv, "1", &obj);
if (rb_block_given_p()) { if (rb_block_given_p()) {
rb_warn("given block not used"); rb_warn("given block not used");
} }
for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) { for (i = 0; i < RARRAY_LEN(ary); i++) {
if (rb_equal(*p, obj)) n++; if (rb_equal(RARRAY_AREF(ary, i), obj)) n++;
} }
} }

10
test/ruby/test_array.rb
View File

@ -572,6 +572,16 @@ class TestArray < Test::Unit::TestCase
assert_equal(3, a.count {|x| x % 2 == 1 }) assert_equal(3, a.count {|x| x % 2 == 1 })
assert_equal(2, a.count(1) {|x| x % 2 == 1 }) assert_equal(2, a.count(1) {|x| x % 2 == 1 })
assert_raise(ArgumentError) { a.count(0, 1) } assert_raise(ArgumentError) { a.count(0, 1) }
bug8654 = '[ruby-core:56072]'
assert_in_out_err [], <<-EOS, ["0"], [], bug8654
a1 = []
a2 = Array.new(100) { |i| i }
r = a2.count do |i|
p i
a2.replace(a1) if i == 0
end
EOS
end end
def test_delete def test_delete