rules: print error message upon invalid regex

dunst-project · Jan 16, 2022 · f254bb6 · f254bb6
1 parent efbfe86
commit f254bb6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/rules.c b/src/rules.c
@@ -151,8 +151,15 @@ static inline bool rule_field_matches_string(const char *value, const char *patt
                 regex_t     regex;
 
                 // TODO compile each regex only once
-                if (regcomp(&regex, pattern, REG_NEWLINE | REG_EXTENDED | REG_NOSUB))
+                int err = regcomp(&regex, pattern, REG_NEWLINE | REG_EXTENDED | REG_NOSUB);
+                if (err) {
+                        size_t err_size = regerror(err, &regex, NULL, 0);
+                        char *err_buf = malloc(err_size);
+                        regerror(err, &regex, err_buf, err_size);
+                        LOG_W("%s: \"%s\"", err_buf, pattern);
+                        free(err_buf);
                         return false;
+                }
 
                 for (int i = 0; ; i++) {
                         if (regexec(&regex, value, 0, NULL, 0))

diff --git a/test/rules.c b/test/rules.c
@@ -55,6 +55,8 @@ TEST test_pattern_match(void) {
 
                 // Special characters
                 ASSERT_FALSE(rule_field_matches_string("{", "{"));
+                ASSERT(rule_field_matches_string("{", "\\{"));
+                ASSERT(rule_field_matches_string("a", "(a)"));
         } else {
                 // Single character matching
                 ASSERT(rule_field_matches_string("a", "?"));