summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-22 03:01:45 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-22 03:01:45 +0000
commit3002e5e1f9767e914ccd3e1fcfd96b38b1fd438f (patch)
tree6fb0d5343a6659dd0c0fe75b4f4837b0bc926e28 /string.c
parentd9615bf9c54414906ea9bac51f2a6e7ffd10c5cf (diff)
* string.c (rb_str_concat): set ENC_CODERANGE_VALID when the
receiver is 7BIT and the argument is non ASCII. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/string.c b/string.c
index f77032f635..20466e16f2 100644
--- a/string.c
+++ b/string.c
@@ -2043,6 +2043,8 @@ rb_str_concat(VALUE str1, VALUE str2)
}
rb_str_resize(str1, pos+len);
rb_enc_mbcput(lc, RSTRING_PTR(str1)+pos, enc);
+ if (cr == ENC_CODERANGE_7BIT && lc > 127)
+ cr = ENC_CODERANGE_VALID;
ENC_CODERANGE_SET(str1, cr);
return str1;
}