diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-14 03:50:39 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-14 03:50:39 +0000 |
commit | 441dbecf4306864fe1bc01211e2ee047fb2eb501 (patch) | |
tree | 87d6d3bf2772f2325ee1e54d22edc63a701b2e1b /string.c | |
parent | b3d8a4060cb9ab86b28f85ff32c5b4bebd3b6830 (diff) | |
download | ruby-441dbecf4306864fe1bc01211e2ee047fb2eb501.tar.gz |
* string.c (rb_str_concat): fixed range check for Fixnum, and
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
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -1983,24 +1983,35 @@ rb_str_append(VALUE str, VALUE str2) VALUE rb_str_concat(VALUE str1, VALUE str2) { + SIGNED_VALUE lc; + if (FIXNUM_P(str2)) { - if (NEGFIXABLE(str2)) + lc = FIX2LONG(str2); + if (lc < 0) rb_raise(rb_eRangeError, "negative argument"); } else if (TYPE(str2) == T_BIGNUM) { if (!RBIGNUM_SIGN(str2)) rb_raise(rb_eRangeError, "negative argument"); + lc = rb_big2ulong(str2); } else { 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); - unsigned int c = NUM2UINT(str2); long pos = RSTRING_LEN(str1); - int len = rb_enc_codelen(c, enc); 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_enc_mbcput(c, RSTRING_PTR(str1)+pos, enc); ENC_CODERANGE_SET(str1, cr); |