Browse Source

[Minor] Deny zero length in regexp search functions

pull/4887/head
Vsevolod Stakhov 1 month ago
parent
commit
05636d9af8
No account linked to committer's email address
1 changed files with 5 additions and 11 deletions
  1. 5
    11
      src/libutil/regexp.c

+ 5
- 11
src/libutil/regexp.c View File

@@ -1,5 +1,5 @@
/*
* Copyright 2023 Vsevolod Stakhov
* Copyright 2024 Vsevolod Stakhov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -567,7 +567,8 @@ rspamd_regexp_search(const rspamd_regexp_t *re, const char *text, gsize len,
g_assert(text != NULL);

if (len == 0) {
len = strlen(text);
/* No length, no match! */
return FALSE;
}

if (re->match_limit > 0 && len > re->match_limit) {
@@ -727,7 +728,8 @@ rspamd_regexp_search(const rspamd_regexp_t *re, const char *text, gsize len,
g_assert(text != NULL);

if (len == 0) {
len = strlen(text);
/* No length, no match! */
return FALSE;
}

if (re->match_limit > 0 && len > re->match_limit) {
@@ -948,10 +950,6 @@ rspamd_regexp_match(const rspamd_regexp_t *re, const char *text, gsize len,
g_assert(re != NULL);
g_assert(text != NULL);

if (len == 0) {
len = strlen(text);
}

if (rspamd_regexp_search(re, text, len, &start, &end, raw, NULL)) {
if (start == text && end == text + len) {
return TRUE;
@@ -1253,10 +1251,6 @@ rspamd_regexp_from_glob(const char *gl, gsize sz, GError **err)

g_assert(gl != NULL);

if (sz == 0) {
sz = strlen(gl);
}

end = gl + sz;
out = g_string_sized_new(sz + 2);
g_string_append_c(out, '^');

Loading…
Cancel
Save