diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-22 02:18:23 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-22 02:18:23 +0000 |
commit | 7a9cf391cd9f9fafaf66c7167c57a32a3efb0ab4 (patch) | |
tree | 7b3c8e7252c1b945be711a1e64dd17285bb63fbd | |
parent | 492dde9c0963dff11217aa26f94148ec906067ae (diff) | |
download | ruby-7a9cf391cd9f9fafaf66c7167c57a32a3efb0ab4.tar.gz |
* string.c (rb_str_substr): copy encoding although empty string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | string.c | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Fri Feb 22 11:16:55 2008 NARUSE, Yui <naruse@ruby-lang.org> + + * string.c (rb_str_substr): copy encoding although empty string. + Fri Feb 22 04:48:22 2008 NARUSE, Yui <naruse@ruby-lang.org> * string.c (rb_str_times): empty string's coderange is CODERANGE_7BIT. @@ -1242,7 +1242,10 @@ rb_str_substr(VALUE str, long beg, long len) else { str2 = rb_str_new5(str, p, len); if (len) rb_enc_cr_str_copy(str2, str); - else ENC_CODERANGE_SET(str2, ENC_CODERANGE_7BIT); + else { + rb_enc_copy(str2, str); + ENC_CODERANGE_SET(str2, ENC_CODERANGE_7BIT); + } OBJ_INFECT(str2, str); } |