summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-01 06:10:39 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-01 06:10:39 +0000
commit1b5e93c6f3d83852b633e7b087a706d6760ad0c4 (patch)
tree405681487f9dbd1bb353007259fc2b039961f8d1 /array.c
parent47dfdac0f2e1a39f71f81fb033bd6dccec070925 (diff)
merge revision(s) 17756:
* array.c (rb_ary_fill): check if beg is too big. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17759 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/array.c b/array.c
index 1387269993..503a7adba3 100644
--- a/array.c
+++ b/array.c
@@ -2275,7 +2275,7 @@ rb_ary_fill(argc, argv, ary)
if (len < 0) {
return ary;
}
- if (len > ARY_MAX_SIZE - beg) {
+ if (beg >= ARY_MAX_SIZE || len > ARY_MAX_SIZE - beg) {
rb_raise(rb_eArgError, "argument too big");
}
end = beg + len;