From da42c102c18156c2192df203cb2f79b88aa8092f Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 5 Jan 2008 16:39:38 +0000
Subject: * re.c (rb_reg_initialize_str): /\x80/n is not an error even if
 script   encoding is EUC-JP.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14899 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 re.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 're.c')

diff --git a/re.c b/re.c
index 9de2a0efa3..50fa341d15 100644
--- a/re.c
+++ b/re.c
@@ -2035,8 +2035,14 @@ rb_reg_initialize(VALUE obj, const char *s, int len, rb_encoding *enc,
 static int
 rb_reg_initialize_str(VALUE obj, VALUE str, int options, onig_errmsg_buffer err)
 {
-    return rb_reg_initialize(obj, RSTRING_PTR(str), RSTRING_LEN(str), rb_enc_get(str),
-			     options, err);
+    int ret;
+    rb_encoding *enc = rb_enc_get(str);
+    if (options & ARG_ENCODING_NONE)
+        enc = rb_ascii8bit_encoding();
+    ret = rb_reg_initialize(obj, RSTRING_PTR(str), RSTRING_LEN(str), enc,
+			    options, err);
+    RB_GC_GUARD(str);
+    return ret;
 }
 
 static VALUE
-- 
cgit v1.2.3