From 5a1f6c6d6e47be9607c9820e73e233ad0b43bff9 Mon Sep 17 00:00:00 2001 From: mame Date: Tue, 25 Mar 2008 10:13:03 +0000 Subject: * array.c (ary_new): fix size check. [ruby-dev:34123] * array.c (rb_ary_take, rb_ary_drop): check negative size and use NUM2LONG instead of FIX2LONG. [ruby-dev:34123] * enum.c (enum_take, enum_drop): check negative size. * test/ruby/test_array.rb: add tests for above. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_array.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'test/ruby') diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index ea2cef85c..e9dab8e19 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -1232,6 +1232,8 @@ class TestArray < Test::Unit::TestCase def test_take assert_equal([1,2,3], [1,2,3,4,5,0].take(3)) + assert_raise(ArgumentError, '[ruby-dev:34123]') { [1,2].take(-1) } + assert_equal([1,2], [1,2].take(1000000000), '[ruby-dev:34123]') end def test_take_while @@ -1240,6 +1242,8 @@ class TestArray < Test::Unit::TestCase def test_drop assert_equal([4,5,0], [1,2,3,4,5,0].drop(3)) + assert_raise(ArgumentError, '[ruby-dev:34123]') { [1,2].drop(-1) } + assert_equal([], [1,2].drop(1000000000), '[ruby-dev:34123]') end def test_drop_while -- cgit