1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge revision(s) 17470:17472:

Browse Source 
* array.c (rb_ary_store, rb_ary_splice): not depend on unspecified
	  behavior at integer overflow.
	* string.c (str_buf_cat): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2008-06-20 06:51:54 +00:00
parent 60243650cf
commit 705ee8575b
3 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
array.c
View File

@ -370,7 +370,7 @@ rb_ary_store(ary, idx, val)
if (new_capa < ARY_DEFAULT_SIZE) { if (new_capa < ARY_DEFAULT_SIZE) {
new_capa = ARY_DEFAULT_SIZE; new_capa = ARY_DEFAULT_SIZE;
} }
else if (new_capa >= ARY_MAX_SIZE - idx) { if (new_capa >= ARY_MAX_SIZE - idx) {
new_capa = (ARY_MAX_SIZE - idx) / 2; new_capa = (ARY_MAX_SIZE - idx) / 2;
} }
new_capa += idx; new_capa += idx;
@ -971,10 +971,10 @@ rb_ary_splice(ary, beg, len, rpl)
rb_ary_modify(ary); rb_ary_modify(ary);
if (beg >= RARRAY(ary)->len) { if (beg >= RARRAY(ary)->len) {
len = beg + rlen; if (beg > ARY_MAX_SIZE - rlen) {
if (len < 0 || len > ARY_MAX_SIZE) {
rb_raise(rb_eIndexError, "index %ld too big", beg); rb_raise(rb_eIndexError, "index %ld too big", beg);
} }
len = beg + rlen;
if (len >= RARRAY(ary)->aux.capa) { if (len >= RARRAY(ary)->aux.capa) {
REALLOC_N(RARRAY(ary)->ptr, VALUE, len); REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
RARRAY(ary)->aux.capa = len; RARRAY(ary)->aux.capa = len;

56
string.c
View File

@ -684,18 +684,14 @@ rb_str_resize(str, len)
return str; return str;
} }
VALUE static VALUE
rb_str_buf_cat(str, ptr, len) str_buf_cat(str, ptr, len)
VALUE str; VALUE str;
const char *ptr; const char *ptr;
long len; long len;
{ {
long capa, total; long capa, total;
if (len == 0) return str;
if (len < 0) {
rb_raise(rb_eArgError, "negative string size (or size too big)");
}
rb_str_modify(str); rb_str_modify(str);
if (FL_TEST(str, STR_ASSOC)) { if (FL_TEST(str, STR_ASSOC)) {
FL_UNSET(str, STR_ASSOC); FL_UNSET(str, STR_ASSOC);
@ -704,9 +700,16 @@ rb_str_buf_cat(str, ptr, len)
else { else {
capa = RSTRING(str)->aux.capa; capa = RSTRING(str)->aux.capa;
} }
if (RSTRING(str)->len >= LONG_MAX - len) {
rb_raise(rb_eArgError, "string sizes too big");
}
total = RSTRING(str)->len+len; total = RSTRING(str)->len+len;
if (capa <= total) { if (capa <= total) {
while (total > capa) { while (total > capa) {
if (capa + 1 >= LONG_MAX / 2) {
capa = total;
break;
}
capa = (capa + 1) * 2; capa = (capa + 1) * 2;
} }
RESIZE_CAPA(str, capa); RESIZE_CAPA(str, capa);
@ -718,6 +721,19 @@ rb_str_buf_cat(str, ptr, len)
return str; return str;
} }
VALUE
rb_str_buf_cat(str, ptr, len)
VALUE str;
const char *ptr;
long len;
{
if (len == 0) return str;
if (len < 0) {
rb_raise(rb_eArgError, "negative string size (or size too big)");
}
return str_buf_cat(str, ptr, len);
}
VALUE VALUE
rb_str_buf_cat2(str, ptr) rb_str_buf_cat2(str, ptr)
VALUE str; VALUE str;
@ -759,33 +775,7 @@ VALUE
rb_str_buf_append(str, str2) rb_str_buf_append(str, str2)
VALUE str, str2; VALUE str, str2;
{ {
long capa, len; return str_buf_cat(str, RSTRING(str2)->ptr, RSTRING(str2)->len);
rb_str_modify(str);
if (FL_TEST(str, STR_ASSOC)) {
FL_UNSET(str, STR_ASSOC);
capa = RSTRING(str)->aux.capa = RSTRING(str)->len;
}
else {
capa = RSTRING(str)->aux.capa;
}
len = RSTRING(str)->len+RSTRING(str2)->len;
if (len < 0 || (capa+1) > LONG_MAX / 2) {
rb_raise(rb_eArgError, "string sizes too big");
}
if (capa <= len) {
while (len > capa) {
capa = (capa + 1) * 2;
}
RESIZE_CAPA(str, capa);
}
memcpy(RSTRING(str)->ptr + RSTRING(str)->len,
RSTRING(str2)->ptr, RSTRING(str2)->len);
RSTRING(str)->len += RSTRING(str2)->len;
RSTRING(str)->ptr[RSTRING(str)->len] = '\0'; /* sentinel */
OBJ_INFECT(str, str2);
return str;
} }
VALUE VALUE

2
version.h
View File

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-20" #define RUBY_RELEASE_DATE "2008-06-20"
#define RUBY_VERSION_CODE 185 #define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20080620 #define RUBY_RELEASE_CODE 20080620
#define RUBY_PATCHLEVEL 229 #define RUBY_PATCHLEVEL 230
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8