* string.c (rb_enc_cr_str_copy): check string's coderange is 7bit or

  valid.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 11 insertions, 2 deletions

diff --git a/string.c b/string.c
index 90ed51b108..da7eba3cba 100644
--- a/string.c
+++ b/string.c
@@ -215,8 +215,17 @@ void
 rb_enc_cr_str_copy(VALUE dest, VALUE src)
 {
     rb_enc_copy(dest, src);
-    if (!is_broken_string(src))
-	ENC_CODERANGE_SET(dest, ENC_CODERANGE(src));
+    switch (ENC_CODERANGE(src)) {
+    case ENC_CODERANGE_7BIT:
+	ENC_CODERANGE_SET(dest, ENC_CODERANGE_7BIT);
+	break;
+    case ENC_CODERANGE_VALID:
+	if (search_nonascii(RSTRING_PTR(dest), RSTRING_END(dest)))
+	    ENC_CODERANGE_SET(dest, ENC_CODERANGE_VALID);
+	else
+	    ENC_CODERANGE_SET(dest, ENC_CODERANGE_7BIT);
+	break;
+    }
 }
 
 void