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

* string.c (rb_str_concat): raise RangeError when the argument is

Browse source 
negative value. [ruby-core:27583]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-01-14 00:39:40 +00:00
parent 4bf4ddb693
commit b3d8a4060c
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Jan 14 09:34:31 2010 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (rb_str_concat): raise RangeError when the argument is
negative value. [ruby-core:27583]
Thu Jan 14 08:49:59 2010 Tanaka Akira <akr@fsij.org> Thu Jan 14 08:49:59 2010 Tanaka Akira <akr@fsij.org>
* time.c (time_to_r): convert to rational if internal representation * time.c (time_to_r): convert to rational if internal representation

14
string.c
View file

@ -1983,7 +1983,18 @@ rb_str_append(VALUE str, VALUE str2)
VALUE VALUE
rb_str_concat(VALUE str1, VALUE str2) rb_str_concat(VALUE str1, VALUE str2)
{ {
if (FIXNUM_P(str2) || TYPE(str2) == T_BIGNUM) { if (FIXNUM_P(str2)) {
if (NEGFIXABLE(str2))
rb_raise(rb_eRangeError, "negative argument");
}
else if (TYPE(str2) == T_BIGNUM) {
if (!RBIGNUM_SIGN(str2))
rb_raise(rb_eRangeError, "negative argument");
}
else {
return rb_str_append(str1, str2);
}
{
rb_encoding *enc = STR_ENC_GET(str1); rb_encoding *enc = STR_ENC_GET(str1);
unsigned int c = NUM2UINT(str2); unsigned int c = NUM2UINT(str2);
long pos = RSTRING_LEN(str1); long pos = RSTRING_LEN(str1);
@ -1995,7 +2006,6 @@ rb_str_concat(VALUE str1, VALUE str2)
ENC_CODERANGE_SET(str1, cr); ENC_CODERANGE_SET(str1, cr);
return str1; return str1;
} }
return rb_str_append(str1, str2);
} }
st_index_t st_index_t