Skip to content

Abort signature load for short signature patterns (1.0.2) #952

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
Jun 20, 2023
Merged

Abort signature load for short signature patterns (1.0.2) #952

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions libclamav/matcher-ac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2951,6 +2951,7 @@ cl_error_t cli_ac_addsig(struct cli_matcher *root, const char *virname, const ch
cli_warnmsg("cli_ac_addsig: cannot use filter for trie\n");
MPOOL_FREE(root->mempool, root->filter);
root->filter = NULL;
return CL_EMALFDB;
}

/* TODO: should this affect maxpatlen? */
Expand Down
1 change: 1 addition & 0 deletions libclamav/matcher-bm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ cl_error_t cli_bm_addpatt(struct cli_matcher *root, struct cli_bm_patt *pattern,
cli_warnmsg("cli_bm_addpatt: cannot use filter for trie\n");
MPOOL_FREE(root->mempool, root->filter);
root->filter = NULL;
return CL_EMALFDB;
}
/* TODO: should this affect maxpatlen? */
}
Expand Down
8 changes: 5 additions & 3 deletions libclamav/readdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4862,9 +4862,11 @@ cl_error_t cli_load(const char *filename, struct cl_engine *engine, unsigned int
if (fs)
fclose(fs);

if (engine->cb_sigload_progress) {
/* Let the progress callback function know how we're doing */
(void)engine->cb_sigload_progress(engine->num_total_signatures, *signo, engine->cb_sigload_progress_ctx);
if (CL_SUCCESS == ret) {
if (engine->cb_sigload_progress) {
/* Let the progress callback function know how we're doing */
(void)engine->cb_sigload_progress(engine->num_total_signatures, *signo, engine->cb_sigload_progress_ctx);
}
}

return ret;
Expand Down