Skip to content

clam-1645 fix overread during ldb load #560

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
May 31, 2022
Merged

clam-1645 fix overread during ldb load #560

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
13 changes: 9 additions & 4 deletions libclamav/readdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,15 +243,16 @@ cl_error_t cli_sigopts_handler(struct cli_matcher *root, const char *virname, co
* TODO - consider handling in cli_ac_addpatt? (two pattern possibility)
*/
if (sigopts & ACPATT_OPTION_WIDE) {
size_t ovrlen = 2 * strlen(hexcpy) + 1;
size_t hexcpylen = strlen(hexcpy);
size_t ovrlen = 2 * hexcpylen + 1;
char *hexovr = cli_calloc(ovrlen, sizeof(char));
if (!hexovr) {
free(hexcpy);
return CL_EMEM;
}

/* clamav-specific wildcards need to be handled here! */
for (i = 0; i < strlen(hexcpy); ++i) {
for (i = 0; i < hexcpylen; ++i) {
size_t len = strlen(hexovr);

if (hexcpy[i] == '*' || hexcpy[i] == '|' || hexcpy[i] == ')') {
Expand All @@ -265,7 +266,7 @@ cl_error_t cli_sigopts_handler(struct cli_matcher *root, const char *virname, co

hexovr[len] = '}';
} else if (hexcpy[i] == '{') {
while (i < strlen(hexcpy) && hexcpy[i] != '}')
while (i < hexcpylen && hexcpy[i] != '}')
hexovr[len++] = hexcpy[i++];

hexovr[len] = '}';
Expand All @@ -276,7 +277,11 @@ cl_error_t cli_sigopts_handler(struct cli_matcher *root, const char *virname, co
/* copies '(' */
hexovr[len] = hexcpy[i];

if (hexcpy[i + 1] == 'B' || hexcpy[i + 1] == 'L' || hexcpy[i + 1] == 'W') {
if (i+2 >= hexcpylen) {
free(hexcpy);
free(hexovr);
return CL_EMALFDB;
} else if (hexcpy[i + 1] == 'B' || hexcpy[i + 1] == 'L' || hexcpy[i + 1] == 'W') {
++len;
++i;
hexovr[len++] = hexcpy[i++];
Expand Down