blah

Cisco-Talos · May 17, 2022 · 1efecfd · 1efecfd
1 parent b9519c1
commit 1efecfd
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/libclamav/regex_suffix.c b/libclamav/regex_suffix.c
@@ -200,13 +200,9 @@ static uint8_t *parse_char_class(const uint8_t *pat, size_t *pos)
             unsigned char range_end;
             unsigned int c;
             if (0 == range_start) {
-<<<<<<< HEAD
-                cli_errmsg("parse_char_class: range_start not initialized");
-                return NULL;
-=======
                 FREE(bitmap);
+                cli_errmsg("parse_char_class: range_start not initialized");
                 goto done;
->>>>>>> Removed asserts
             }
             ++*pos;
             if (pat[*pos] == '[')