diff options
-rw-r--r-- | ChangeLog | 18 | ||||
-rw-r--r-- | array.c | 15 | ||||
-rw-r--r-- | test/ruby/test_array.rb | 22 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 49 insertions, 8 deletions
@@ -1,3 +1,21 @@ +Thu Oct 10 00:58:39 2013 Benoit Daloze <eregontp@gmail.com> + + * test/ruby/test_array.rb (test_count): add a test case for #count + with an argument. See Bug #8654. + +Thu Oct 10 00:58:39 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 Oct 10 00:58:39 2013 Masaki Matsushita <glass.saga@gmail.com> + + * array.c (rb_ary_count): iterate items appropriately. + [Bug #8654] + Thu Oct 10 00:44:28 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * process.c (rb_fork_internal): remove cloexec setting on pipes @@ -4113,27 +4113,28 @@ rb_ary_compact(VALUE ary) static VALUE rb_ary_count(int argc, VALUE *argv, VALUE ary) { - long n = 0; + long i, n = 0; if (argc == 0) { - VALUE *p, *pend; + VALUE v; if (!rb_block_given_p()) return LONG2NUM(RARRAY_LEN(ary)); - for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) { - if (RTEST(rb_yield(*p))) n++; + for (i = 0; i < RARRAY_LEN(ary); i++) { + v = RARRAY_PTR(ary)[i]; + if (RTEST(rb_yield(v))) n++; } } else { - VALUE obj, *p, *pend; + VALUE obj; rb_scan_args(argc, argv, "1", &obj); if (rb_block_given_p()) { rb_warn("given block not used"); } - for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) { - if (rb_equal(*p, obj)) n++; + for (i = 0; i < RARRAY_LEN(ary); i++) { + if (rb_equal(RARRAY_PTR(ary)[i], obj)) n++; } } diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 71b514419f..a8c975e961 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -576,6 +576,28 @@ class TestArray < Test::Unit::TestCase assert_equal(3, a.count {|x| x % 2 == 1 }) assert_equal(2, a.count(1) {|x| x % 2 == 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 + + assert_in_out_err [], <<-EOS, ["[]", "0"], [], bug8654 + ARY = Array.new(100) { |i| i } + class Fixnum + def == other + ARY.replace([]) if self.equal?(0) + p ARY + self.equal?(other) + end + end + p ARY.count(42) + EOS end def test_delete @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-10-10" -#define RUBY_PATCHLEVEL 331 +#define RUBY_PATCHLEVEL 332 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 10 |