* re.c (rb_reg_preprocess): force fixed encoding when ASCII

  incompatible source string.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 1 deletions

diff --git a/re.c b/re.c
index a03bea575..023731907 100644
--- a/re.c
+++ b/re.c
@@ -1908,7 +1908,13 @@ rb_reg_preprocess(const char *p, const char *end, rb_encoding *enc,
 
     buf = rb_str_buf_new(0);
 
-    *fixed_enc = 0;
+    if (rb_enc_asciicompat(enc))
+        *fixed_enc = 0;
+    else {
+        *fixed_enc = enc;
+        rb_enc_associate(buf, enc);
+    }
+
     if (unescape_nonascii(p, end, enc, buf, fixed_enc, err) != 0)
         return Qnil;