Skip to content

Clam 2213 Handle case of empty regex in database #812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
val-ms merged 1 commit into from
Feb 3, 2023
+41 −19
Merged

Clam 2213 Handle case of empty regex in database #812

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 41 additions & 19 deletions libclamav/regex_list.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,15 +403,27 @@ static int functionality_level_check(char *line)

static int add_hash(struct regex_matcher *matcher, char *pattern, const char fl, int is_prefix)
{
int rc;
struct cli_bm_patt *pat = MPOOL_CALLOC(matcher->mempool, 1, sizeof(*pat));
struct cli_matcher *bm;
const char *vname = NULL;
if (!pat)
return CL_EMEM;
int rc = CL_SUCCESS;
struct cli_bm_patt *pat = NULL;
struct cli_matcher *bm = NULL;
const char *vname = NULL;

if (0 == strlen(pattern)) {
cli_errmsg("add_hash: Invalid pattern '%s' in database\n", pattern);
rc = CL_EMALFDB;
goto done;
}

pat = MPOOL_CALLOC(matcher->mempool, 1, sizeof(*pat));
if (!pat) {
rc = CL_EMEM;
goto done;
}
pat->pattern = (unsigned char *)CLI_MPOOL_HEX2STR(matcher->mempool, pattern);
if (!pat->pattern)
return CL_EMALFDB;
if (!pat->pattern) {
rc = CL_EMALFDB;
goto done;
}
pat->length = 32;
if (is_prefix) {
pat->length = 4;
Expand All @@ -422,7 +434,7 @@ static int add_hash(struct regex_matcher *matcher, char *pattern, const char fl,

if (!matcher->sha256_pfx_set.keys) {
if ((rc = cli_hashset_init(&matcher->sha256_pfx_set, 1048576, 90))) {
return rc;
goto done;
}
}

Expand All @@ -432,27 +444,37 @@ static int add_hash(struct regex_matcher *matcher, char *pattern, const char fl,
if (*vname == 'W') {
/* hash is allowed in local.gdb */
cli_dbgmsg("Skipping hash %s\n", pattern);
MPOOL_FREE(matcher->mempool, pat->pattern);
MPOOL_FREE(matcher->mempool, pat);
return CL_SUCCESS;
rc = CL_SUCCESS;
goto done;
}
}
pat->virname = MPOOL_MALLOC(matcher->mempool, 1);
if (!pat->virname) {
free(pat);
cli_errmsg("add_hash: Unable to allocate memory for path->virname\n");
return CL_EMEM;
rc = CL_EMEM;
goto done;
}
*pat->virname = fl;
cli_hashset_addkey(&matcher->sha256_pfx_set, cli_readint32(pat->pattern));
if ((rc = cli_bm_addpatt(bm, pat, "*"))) {
cli_errmsg("add_hash: failed to add BM pattern\n");
free(pat->pattern);
free(pat->virname);
free(pat);
return CL_EMALFDB;
rc = CL_EMALFDB;
goto done;
}
return CL_SUCCESS;

pat = NULL;
done:
if (pat) {
if (pat->pattern) {
MPOOL_FREE(matcher->mempool, pat->pattern);
}
if (pat->virname) {
MPOOL_FREE(matcher->mempool, pat->virname);
}
MPOOL_FREE(matcher->mempool, pat);
}

return rc;
}

/* Load patterns/regexes from file */
Expand Down