1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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_7@17761 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2008-07-01 06:14:29 +00:00
parent cea5e4cbda
commit c2034afbab
3 changed files with 11 additions and 6 deletions

View file

@ -1,3 +1,7 @@
Tue Jul 1 15:11:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_fill): check if beg is too big.
Mon Jun 30 20:35:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Jun 30 20:35:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (str_buf_cat): check for self concatenation. * string.c (str_buf_cat): check for self concatenation.

View file

@ -2419,7 +2419,7 @@ rb_ary_fill(argc, argv, ary)
if (len < 0) { if (len < 0) {
return ary; 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"); rb_raise(rb_eArgError, "argument too big");
} }
end = beg + len; end = beg + len;

View file

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7" #define RUBY_VERSION "1.8.7"
#define RUBY_RELEASE_DATE "2008-06-30" #define RUBY_RELEASE_DATE "2008-07-01"
#define RUBY_VERSION_CODE 187 #define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20080630 #define RUBY_RELEASE_CODE 20080701
#define RUBY_PATCHLEVEL 39 #define RUBY_PATCHLEVEL 40
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7 #define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 30 #define RUBY_RELEASE_DAY 1
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];
@ -27,3 +27,4 @@ RUBY_EXTERN const char *ruby_copyright;
#define RUBY_RELEASE_STR "patchlevel" #define RUBY_RELEASE_STR "patchlevel"
#define RUBY_RELEASE_NUM RUBY_PATCHLEVEL #define RUBY_RELEASE_NUM RUBY_PATCHLEVEL