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): fixed range check for Fixnum, and

Browse source 
added checks for integer overflow and invalid char code.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26324 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-01-14 03:50:39 +00:00
parent b3d8a4060c
commit 441dbecf43
3 changed files with 26 additions and 3 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 12:50:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_concat): fixed range check for Fixnum, and
added checks for integer overflow and invalid char code.
Thu Jan 14 09:34:31 2010 NARUSE, Yui <naruse@ruby-lang.org> Thu Jan 14 09:34:31 2010 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (rb_str_concat): raise RangeError when the argument is * string.c (rb_str_concat): raise RangeError when the argument is

17
string.c
View file

@ -1983,24 +1983,35 @@ rb_str_append(VALUE str, VALUE str2)
VALUE VALUE
rb_str_concat(VALUE str1, VALUE str2) rb_str_concat(VALUE str1, VALUE str2)
{ {
SIGNED_VALUE lc;
if (FIXNUM_P(str2)) { if (FIXNUM_P(str2)) {
if (NEGFIXABLE(str2)) lc = FIX2LONG(str2);
if (lc < 0)
rb_raise(rb_eRangeError, "negative argument"); rb_raise(rb_eRangeError, "negative argument");
} }
else if (TYPE(str2) == T_BIGNUM) { else if (TYPE(str2) == T_BIGNUM) {
if (!RBIGNUM_SIGN(str2)) if (!RBIGNUM_SIGN(str2))
rb_raise(rb_eRangeError, "negative argument"); rb_raise(rb_eRangeError, "negative argument");
lc = rb_big2ulong(str2);
} }
else { else {
return rb_str_append(str1, str2); return rb_str_append(str1, str2);
} }
#if SIZEOF_INT < SIZEOF_VALUE
if ((VALUE)lc > UINT_MAX) {
rb_raise(rb_eRangeError, "%"PRIuVALUE" out of char range", lc);
}
#endif
{ {
rb_encoding *enc = STR_ENC_GET(str1); rb_encoding *enc = STR_ENC_GET(str1);
unsigned int c = NUM2UINT(str2);
long pos = RSTRING_LEN(str1); long pos = RSTRING_LEN(str1);
int len = rb_enc_codelen(c, enc);
int cr = ENC_CODERANGE(str1); int cr = ENC_CODERANGE(str1);
int c, len;
if ((len = rb_enc_codelen(c = (int)lc, enc)) <= 0) {
rb_raise(rb_eRangeError, "%u invalid char", c);
}
rb_str_resize(str1, pos+len); rb_str_resize(str1, pos+len);
rb_enc_mbcput(c, RSTRING_PTR(str1)+pos, enc); rb_enc_mbcput(c, RSTRING_PTR(str1)+pos, enc);
ENC_CODERANGE_SET(str1, cr); ENC_CODERANGE_SET(str1, cr);

7
test/ruby/test_string.rb
View file

@ -218,6 +218,13 @@ class TestString < Test::Unit::TestCase
l = s.size l = s.size
s << "bar" s << "bar"
assert_equal(l + 3, s.size) assert_equal(l + 3, s.size)
bug = '[ruby-core:27583]'
assert_raise(RangeError, bug) {S("a".force_encoding(Encoding::UTF_8)) << -3}
assert_raise(RangeError, bug) {S("a".force_encoding(Encoding::UTF_8)) << -2}
assert_raise(RangeError, bug) {S("a".force_encoding(Encoding::UTF_8)) << -1}
assert_raise(RangeError, bug) {S("a".force_encoding(Encoding::UTF_8)) << 0x81308130}
assert_nothing_raised {S("a".force_encoding(Encoding::GB18030)) << 0x81308130}
end end
def test_MATCH # '=~' def test_MATCH # '=~'