From f38cc001a7ca64f7f613b5021b1714a2ee3318cb Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 6 Jan 2008 12:15:48 +0000
Subject: * re.c (rb_reg_initialize_str): forbid raw non ASCII character   for
 ASCII-8BIT regexp in non ASCII-8BIT script.

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

(limited to 're.c')

diff --git a/re.c b/re.c
index 8fd80628b8..fb05e2e892 100644
--- a/re.c
+++ b/re.c
@@ -2037,8 +2037,16 @@ rb_reg_initialize_str(VALUE obj, VALUE str, int options, onig_errmsg_buffer err)
 {
     int ret;
     rb_encoding *enc = rb_enc_get(str);
-    if (options & ARG_ENCODING_NONE)
-        enc = rb_ascii8bit_encoding();
+    if (options & ARG_ENCODING_NONE) {
+        rb_encoding *ascii8bit = rb_ascii8bit_encoding();
+        if (enc != ascii8bit) {
+            if (rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT) {
+                strcpy(err, "/.../n has a non escaped non ASCII character in non ASCII-8BIT script");
+                return -1;
+            }
+            enc = ascii8bit;
+        }
+    }
     ret = rb_reg_initialize(obj, RSTRING_PTR(str), RSTRING_LEN(str), enc,
 			    options, err);
     RB_GC_GUARD(str);
-- 
cgit v1.2.3