naruse	2008-02-22 21:15:56 +0900 (Fri, 22 Feb 2008)

  New Revision: 15576

  Modified files:
    trunk/ChangeLog
    trunk/string.c

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

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=15576&r2=15575&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15576&r2=15575&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15575)
+++ ChangeLog	(revision 15576)
@@ -1,3 +1,8 @@
+Fri Feb 22 21:12:42 2008  NARUSE, Yui  <naruse@r...>
+
+	* string.c (rb_enc_cr_str_copy): check string's coderange is 7bit or
+	  valid.
+
 Fri Feb 22 19:50:19 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* bignum.c (BIGZEROP): fix for longer Bignum zeros.  [ruby-Bugs-17454]
Index: string.c
===================================================================
--- string.c	(revision 15575)
+++ string.c	(revision 15576)
@@ -215,8 +215,17 @@
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/