matz: 1.6.0 final (hopufully)

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 2 deletions

diff --git a/array.c b/array.c
index e3e058fd4..e665159ee 100644
--- a/array.c
+++ b/array.c
@@ -355,7 +355,10 @@ rb_ary_unshift_m(argc, argv, ary)
     VALUE *argv;
     VALUE ary;
 {
-    if (argc > 0) {
+    if (argc == 0) {
+	rb_raise(rb_eArgError, "wrong # of arguments(at least 1)");
+    }
+    if (argc > 1) {
 	long len = RARRAY(ary)->len;
 
 	/* make rooms by setting the last item */
@@ -363,7 +366,6 @@ rb_ary_unshift_m(argc, argv, ary)
 
 	/* sliding items */
 	MEMMOVE(RARRAY(ary)->ptr + argc, RARRAY(ary)->ptr, VALUE, len);
-
 	MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
     }
     return ary;