1 files changed, 4 insertions, 0 deletions
diff --git a/array.c b/array.c
index 74bf094f51..cecf4278f1 100644
--- a/array.c
+++ b/array.c
@@ -1529,9 +1529,13 @@ rb_ary_times(ary, times)
     }
 
     len = NUM2LONG(times);
+    if (len == 0) return rb_ary_new2(0);
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative argument");
     }
+    if (LONG_MAX/len < RARRAY(ary)->len) {
+	rb_raise(rb_eArgError, "argument too big");
+    }
     len *= RARRAY(ary)->len;
 
     ary2 = ary_new(rb_obj_class(ary), len);