do not crash on invalid regex

aloneguid · Dec 8, 2023 · 534e719 · 534e719
1 parent e3a343a
commit 534e719
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,11 +1,11 @@
 name: 'Build'
 
 env:
-  VERSION: 3.6.2
+  VERSION: 3.7.0
   BUILD_TYPE: Release
   ARCH: x64
   VCPKG_CONFIG: Release
-  VCPKG_HASH: e8c2a04eb7ca058b6e2f0e6e33c67fdbffeee846
+  VCPKG_HASH: 8ee46dc72f75fc3d8d8dc90386bf7e84f2eb7450
   DOC_ARTIFACT: webHelpBT2-all.zip
 
 on: [push, workflow_dispatch]

diff --git a/bt/app/match_rule.cpp b/bt/app/match_rule.cpp
@@ -180,8 +180,13 @@ namespace bt {
 
     bool match_rule::contains(const string& input, const string& value) const {
         if(is_regex) {
-            regex r{value, regex_constants::icase};
-            return regex_match(input, r);
+            try {
+                regex r{value, regex_constants::icase};
+                return regex_match(input, r);
+            } catch(const std::regex_error& e) {
+                // most probably invalid regex pattern
+                return false;
+            }
         } else {
             return str::contains_ic(input, value);
         }

diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,3 +1,13 @@
+## 3.7.0
+
+## Improvements
+
+- ?
+
+### Bugs fixed
+
+- BT crashed with unhandled exception when regular expression rule was executing a regex with invalid syntax (#59).
+
 ## 3.6.2
 
 🐞Fixed: BT hangs waiting for browser proxy process to terminate. Thanks to @cjs1976 and @fixator10 in #51.

diff --git a/grey b/grey