Merge pull request #2232 from herwinw/regexp_unicode_less_than_4_digits

Raise a RegexpError if less than four digits are given for \uHHHH
natalie-lang · Sep 21, 2024 · 7f2f316 · 7f2f316
2 parents 3e85917 + bde3657
commit 7f2f316
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/spec/core/regexp/shared/new.rb b/spec/core/regexp/shared/new.rb
@@ -453,9 +453,7 @@ def obj.to_int() ScratchPad.record(:called) end
     end
 
     it "raises a RegexpError if less than four digits are given for \\uHHHH" do
-      NATFIXME 'Update error message', exception: SpecFailedException, message: /but the message was/ do
-        -> { Regexp.send(@method, "\\" + "u304") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("invalid Unicode escape: /\\u304/")))
-      end
+      -> { Regexp.send(@method, "\\" + "u304") }.should raise_error(RegexpError, Regexp.new(Regexp.escape("invalid Unicode escape: /\\u304/")))
     end
 
     it "raises a RegexpError if the \\u{} escape is empty" do

diff --git a/src/regexp_object.cpp b/src/regexp_object.cpp
@@ -329,7 +329,15 @@ static String prepare_pattern_for_onigmo(Env *env, const StringObject *pattern,
                 default:
                     new_pattern.append_char('\\');
                     new_pattern.append_char('u');
+                    if (!isxdigit(c))
+                        env->raise("RegexpError", "invalid Unicode escape: /{}/", pattern->string());
                     new_pattern.append_char(c);
+                    for (int i = 1; i < 4; i++) {
+                        c = next_char();
+                        if (!isxdigit(c))
+                            env->raise("RegexpError", "invalid Unicode escape: /{}/", pattern->string());
+                        new_pattern.append_char(c);
+                    }
                 }
 
                 *fixed_encoding = true;