mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* array.c (rb_ary_fill): not depend on unspecified behavior at integer
overflow. reported by Vincenzo Iozzo <snagg AT openssl.it>. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f94c46a745
commit
d02ef8342c
2 changed files with 7 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Wed Jun 25 15:28:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* array.c (rb_ary_fill): not depend on unspecified behavior at integer
|
||||||
|
overflow. reported by Vincenzo Iozzo <snagg AT openssl.it>.
|
||||||
|
|
||||||
Wed Jun 25 13:42:44 2008 NARUSE, Yui <naruse@ruby-lang.org>
|
Wed Jun 25 13:42:44 2008 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
* lib/erb.rb (ERB::Compiler:Buffer#new): push magic comment first.
|
* lib/erb.rb (ERB::Compiler:Buffer#new): push magic comment first.
|
||||||
|
|
4
array.c
4
array.c
|
@ -2145,10 +2145,10 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
rb_ary_modify(ary);
|
rb_ary_modify(ary);
|
||||||
end = beg + len;
|
if (len > ARY_MAX_SIZE - beg) {
|
||||||
if (end < 0) {
|
|
||||||
rb_raise(rb_eArgError, "argument too big");
|
rb_raise(rb_eArgError, "argument too big");
|
||||||
}
|
}
|
||||||
|
end = beg + len;
|
||||||
if (RARRAY_LEN(ary) < end) {
|
if (RARRAY_LEN(ary) < end) {
|
||||||
if (end >= ARY_CAPA(ary)) {
|
if (end >= ARY_CAPA(ary)) {
|
||||||
RESIZE_CAPA(ary, end);
|
RESIZE_CAPA(ary, end);
|
||||||
|
|
Loading…
Reference in a new issue