diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-08 08:09:28 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-08 08:09:28 +0000 |
commit | aeebb6e53874acbba8b614420076a48b2485b087 (patch) | |
tree | 068aed0548776454c4c05736b2d36d3068166ec2 | |
parent | b62f04f5e10cebb1539667c343e136cc69434233 (diff) |
* string.c (rb_str_concat): partially reverts r30040 because
it unpexpectedly changed the behavior of String#<<.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 9 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 15 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Dec 6 22:28:41 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * string.c (rb_str_concat): partially reverts r30040 because + it unpexpectedly changes the behavior of String#<<. + Fri Nov 5 00:14:15 2010 Aaron Patterson <aaron@tenderlovemaking.com> * ext/fiddle/extconf.rb: fixing ffi library location on windows. @@ -1998,14 +1998,23 @@ rb_str_concat(VALUE str1, VALUE str2) unsigned int lc; if (FIXNUM_P(str2)) { + if ((int)str2 < 0) + rb_raise(rb_eRangeError, "negative argument"); lc = FIX2UINT(str2); } else if (TYPE(str2) == T_BIGNUM) { + if (!RBIGNUM_SIGN(str2)) + rb_raise(rb_eRangeError, "negative argument"); lc = NUM2UINT(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); long pos = RSTRING_LEN(str1); @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 90 +#define RUBY_PATCHLEVEL 91 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |