yugui	2009-05-21 23:47:02 +0900 (Thu, 21 May 2009)

  New Revision: 23512

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

  Log:
    merges r23359 from trunk into ruby_1_9_1.
    --
    * array.c (rb_ary_sample): negative sample number is invalid.
      [ruby-core:23374]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/array.c
    branches/ruby_1_9_1/test/ruby/test_array.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/array.c
===================================================================
--- ruby_1_9_1/array.c	(revision 23511)
+++ ruby_1_9_1/array.c	(revision 23512)
@@ -3302,8 +3302,9 @@
     }
     rb_scan_args(argc, argv, "1", &nv);
     n = NUM2LONG(nv);
-    ptr = RARRAY_PTR(ary); 
-    len = RARRAY_LEN(ary); 
+    if (n < 0) rb_raise(rb_eArgError, "negative sample number");
+    ptr = RARRAY_PTR(ary);
+    len = RARRAY_LEN(ary);
     if (n > len) n = len;
     switch (n) {
       case 0: return rb_ary_new2(0);
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23511)
+++ ruby_1_9_1/ChangeLog	(revision 23512)
@@ -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]
+
 Tue May 12 14:35:29 2009  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* win32/Makefile.sub: fixes build failures on win32.
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23511)
+++ ruby_1_9_1/version.h	(revision 23512)
@@ -1,7 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-12"
-#define RUBY_PATCHLEVEL 129
-
+#define RUBY_PATCHLEVEL 130
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_1/test/ruby/test_array.rb
===================================================================
--- ruby_1_9_1/test/ruby/test_array.rb	(revision 23511)
+++ ruby_1_9_1/test/ruby/test_array.rb	(revision 23512)
@@ -1588,6 +1588,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/