4 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fbcaf9f6e8..44bf80fbcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  7 14:26:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_sample): negative sample number is invalid.
+	  [ruby-core:23374]
+
 Tue May 12 14:35:29 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* win32/Makefile.sub: fixes build failures on win32.
diff --git a/array.c b/array.c
index bc342b5867..3301621603 100644
--- a/array.c
+++ b/array.c
@@ -3302,8 +3302,9 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
     }
     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);
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index 36abe09963..384ce239f9 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -1588,6 +1588,8 @@ class TestArray < Test::Unit::TestCase
       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
diff --git a/version.h b/version.h
index b98674fdfa..ae7c2f0094 100644
--- a/version.h
+++ b/version.h
@@ -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