Merge pull request #2228 from herwinw/regexp_invalid_hex_escape

Fix invalid hex escape in Regexp
natalie-lang · Sep 20, 2024 · 3e85917 · 3e85917
2 parents 80ada26 + 22ee029
commit 3e85917
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/spec/core/regexp/shared/new.rb b/spec/core/regexp/shared/new.rb
@@ -293,9 +293,7 @@ def obj.to_int() ScratchPad.record(:called) end
     end
 
     it "raises a RegexpError if \\x is not followed by any hexadecimal digits" do
-      NATFIXME "raises a RegexpError if \\x is not followed by any hexadecimal digits", exception: SpecFailedException do
-        -> { Regexp.send(@method, "\\" + "xn") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("invalid hex escape: /\\xn/")))
-      end
+      -> { Regexp.send(@method, "\\" + "xn") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("invalid hex escape: /\\xn/")))
     end
 
     it "accepts an escaped string interpolation" do

diff --git a/src/regexp_object.cpp b/src/regexp_object.cpp
@@ -338,9 +338,15 @@ static String prepare_pattern_for_onigmo(Env *env, const StringObject *pattern,
             }
 
             case 'x': {
+                c = next_char();
+                if (!std::isxdigit(c))
+                    env->raise("RegexpError", "invalid hex escape: /{}/", pattern->string());
+
                 *fixed_encoding = true;
                 new_pattern.append_char('\\');
                 new_pattern.append_char('x');
+                new_pattern.append_char(c);
+
                 break;
             }