nobu	2009-05-07 14:26:16 +0900 (Thu, 07 May 2009)

  New Revision: 23359

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23359

  Log:
    * array.c (rb_ary_sample): negative sample number is invalid.
      [ruby-core:23374]

  Modified files:
    trunk/ChangeLog
    trunk/array.c
    trunk/test/ruby/test_array.rb

Index: array.c
===================================================================
--- array.c	(revision 23358)
+++ array.c	(revision 23359)
@@ -3450,6 +3450,7 @@
     }
     rb_scan_args(argc, argv, "1", &nv);
     n = NUM2LONG(nv);
+    if (n < 0) rb_raise(rb_eArgError, "negative sample number");
     ptr = RARRAY_PTR(ary);
     len = RARRAY_LEN(ary);
     if (n > len) n = len;
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23358)
+++ ChangeLog	(revision 23359)
@@ -1,3 +1,8 @@
+Thu May  7 14:26:14 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* array.c (rb_ary_sample): negative sample number is invalid.
+	  [ruby-core:23374]
+
 Thu May  7 14:16:24 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c, include/ruby/encoding.h: fixed types.
Index: test/ruby/test_array.rb
===================================================================
--- test/ruby/test_array.rb	(revision 23358)
+++ test/ruby/test_array.rb	(revision 23359)
@@ -1605,6 +1605,8 @@
       end
       assert_operator(h.values.min * 2, :>=, h.values.max) if n != 0
     end
+
+    assert_raise(ArgumentError, '[ruby-core:23374]') {[1, 2].sample(-1)}
   end
 
   def test_cycle

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/