From aeebb6e53874acbba8b614420076a48b2485b087 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 8 Dec 2010 08:09:28 +0000
Subject: * 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
---
 string.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'string.c')

diff --git a/string.c b/string.c
index bee5fb100b..cdb919939b 100644
--- a/string.c
+++ b/string.c
@@ -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);
-- 
cgit v1.2.3