diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-01 06:03:45 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-01 06:03:45 +0000 |
commit | 78b45a0bc00bd717e5adf21f50373155e3b6eb24 (patch) | |
tree | f2d94bc726f8740f78804828e9f3c0206c83a3b1 /string.c | |
parent | 72d3e2b1027a1711777b83a37fd34c89b59fffff (diff) | |
download | ruby-78b45a0bc00bd717e5adf21f50373155e3b6eb24.tar.gz |
string.c: coderange appending to empty string
* string.c (rb_enc_cr_str_buf_cat, rb_str_append): consider an empty
string 7bit-clean and should not discard cached coderange of string
to be appended.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1958,7 +1958,7 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len, int res_encindex; int str_cr, res_cr; - str_cr = ENC_CODERANGE(str); + str_cr = RSTRING_LEN(str) ? ENC_CODERANGE(str) : ENC_CODERANGE_7BIT; if (str_encindex == ptr_encindex) { if (str_cr == ENC_CODERANGE_UNKNOWN) @@ -2095,7 +2095,8 @@ rb_str_append(VALUE str, VALUE str2) long len = RSTRING_LEN(str) + len2; enc = rb_enc_check(str, str2); cr = ENC_CODERANGE(str); - if ((cr2 = ENC_CODERANGE(str2)) > cr) cr = cr2; + if ((cr2 = ENC_CODERANGE(str2)) > cr || RSTRING_LEN(str) == 0) + cr = cr2; rb_str_modify_expand(str, len2); memcpy(RSTRING(str)->as.heap.ptr + RSTRING(str)->as.heap.len, RSTRING_PTR(str2), len2+1); |