2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a049353930..7bd5151192 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  9 20:58:16 2008  Tanaka Akira  <[email protected]>
+
+	* array.c (rb_ary_fill): don't raise even if length is negative.
+	  [ruby-core:17483], [ruby-core:17661]
+
 Wed Jul  9 01:38:37 2008  Nobuyoshi Nakada  <[email protected]>
 
 	* string.c (rb_str_succ): alphabets or numerics mutually enclosing
diff --git a/array.c b/array.c
index b5dd604fa6..7e8c12b683 100644
--- a/array.c
+++ b/array.c
@@ -2413,10 +2413,12 @@ rb_ary_fill(argc, argv, ary)
 	    if (beg < 0) beg = 0;
 	}
 	len = NIL_P(arg2) ? RARRAY(ary)->len - beg : NUM2LONG(arg2);
-	if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len);
 	break;
     }
     rb_ary_modify(ary);
+    if (len < 0) {
+        return ary;
+    }
     if (beg >= ARY_MAX_SIZE || len > ARY_MAX_SIZE - beg) {
 	rb_raise(rb_eArgError, "argument too big");
     }