Skip to content

Clam 2324 more coverity fixes 2 #899

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 14 commits into from
Apr 26, 2023
Merged

Clam 2324 more coverity fixes 2 #899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c9adeff
Coverity: fix assorted static analysis issues
val-ms Apr 17, 2023
a69f803
Assorted unit test Coverity fixes
val-ms Apr 18, 2023
b222fc2
Coverity-396088: Fix possible use of uninitialized variable in msxml …
val-ms Apr 18, 2023
8c39174
Coverity-401432: Correctly initialize file descriptor in HFS+ parser
val-ms Apr 18, 2023
736fe01
Coverity-396111: Fix possibly unitialized binop variable in bytecode …
val-ms Apr 18, 2023
e5bef6d
Coverity-396100: Initialize url flags variable in phishcheck module.
val-ms Apr 18, 2023
dcb56ad
Coverity-396093: Correctly initialize zlib stream structure in vba_ex…
val-ms Apr 18, 2023
9694cad
Coverity-396091: Initialize host array in clamav-milter netcode.
val-ms Apr 18, 2023
8745c10
Coverity-344513: Fix use-after-free in unit test error condition.
val-ms Apr 18, 2023
84bf2c7
Coverity and OSS-Fuzz fixes in PDF module
val-ms Apr 19, 2023
2d31e0c
Assorted clamd unit test Coverity fixes
val-ms Apr 20, 2023
d9c3da6
Resolve Coverity assignment of overlapping memory warnings
val-ms Apr 20, 2023
9af0201
Fix assorted Coverity warnings in EGG parser
val-ms Apr 20, 2023
231aeeb
EGG parser: Fix error handling when comment can't be converted to utf8
val-ms Apr 21, 2023
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
3 changes: 2 additions & 1 deletion clamav-milter/netcode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,8 @@ int islocalnet_name(char *name)

int islocalnet_sock(struct sockaddr *sa)
{
uint32_t host[4], family;
uint32_t host[4] = {0};
uint32_t family;

if (!lnet) return 0;

Expand Down
14 changes: 13 additions & 1 deletion libclamav/autoit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,10 @@ static cl_error_t ea05(cli_ctx *ctx, const uint8_t *base, char *tmpd)
cli_dbgmsg("autoit: file is compressed\n");
if (cli_readint32(UNP.inputbuf) != 0x35304145) {
cli_dbgmsg("autoit: bad magic or unsupported version\n");
// Free this inputbuf and set back to NULL.
free(UNP.inputbuf);
UNP.inputbuf = NULL;

continue;
}

Expand All @@ -769,6 +773,10 @@ static cl_error_t ea05(cli_ctx *ctx, const uint8_t *base, char *tmpd)
}

if (cli_checklimits("autoit", ctx, UNP.usize, 0, 0) != CL_CLEAN) {
// Free this inputbuf and set back to NULL.
free(UNP.inputbuf);
UNP.inputbuf = NULL;

continue;
}

Expand Down Expand Up @@ -848,12 +856,16 @@ static cl_error_t ea05(cli_ctx *ctx, const uint8_t *base, char *tmpd)
*/
cli_dbgmsg("autoit: file is not compressed\n");
UNP.outputbuf = UNP.inputbuf;
UNP.usize = UNP.csize;
UNP.inputbuf = NULL;

UNP.usize = UNP.csize;
}

if (UNP.usize < 4) {
cli_dbgmsg("autoit: file is too short\n");
free(UNP.outputbuf);
UNP.outputbuf = NULL;

continue;
}

Expand Down
41 changes: 34 additions & 7 deletions libclamav/bytecode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1258,6 +1258,10 @@ static cl_error_t parseBB(struct cli_bc *bc, unsigned func, unsigned bb, unsigne
BB->insts = &bcfunc->allinsts[bcfunc->insn_idx];
while (!last) {
unsigned numOp;

// Initialize instruction to zero
memset(&inst, 0, sizeof(inst));

if (buffer[offset] == 'T') {
last = 1;
offset++;
Expand Down Expand Up @@ -1355,6 +1359,33 @@ static cl_error_t parseBB(struct cli_bc *bc, unsigned func, unsigned bb, unsigne
inst.u.ops.ops[i] = readOperand(bcfunc, buffer, &offset, len, &ok);
}
break;
case OP_BC_STORE:
numOp = operand_counts[inst.opcode];
if (2 != numOp) {
// invalid number of operands
cli_errmsg("Invalid number of operands (%u) for OP_BC_STORE opcode\n", numOp);
return CL_EMALFDB;
}
inst.u.binop[0] = readOperand(bcfunc, buffer, &offset, len, &ok);
inst.u.binop[1] = readOperand(bcfunc, buffer, &offset, len, &ok);

int16_t t = get_optype(bcfunc, inst.u.binop[0]);
if (t) {
inst.type = t;
}
break;
case OP_BC_COPY:
numOp = operand_counts[inst.opcode];
if (2 != numOp) {
// invalid number of operands
cli_errmsg("Invalid number of operands (%u) for OP_BC_COPY opcode\n", numOp);
return CL_EMALFDB;
}
inst.u.binop[0] = readOperand(bcfunc, buffer, &offset, len, &ok);
inst.u.binop[1] = readOperand(bcfunc, buffer, &offset, len, &ok);

inst.type = get_optype(bcfunc, inst.u.binop[1]);
break;
case OP_BC_ICMP_EQ:
case OP_BC_ICMP_NE:
case OP_BC_ICMP_UGT:
Expand Down Expand Up @@ -1391,22 +1422,18 @@ static cl_error_t parseBB(struct cli_bc *bc, unsigned func, unsigned bb, unsigne
break;
}
}
if (inst.opcode == OP_BC_STORE) {
int16_t t = get_optype(bcfunc, inst.u.binop[0]);
if (t)
inst.type = t;
}
if (inst.opcode == OP_BC_COPY)
inst.type = get_optype(bcfunc, inst.u.binop[1]);

if (!ok) {
cli_errmsg("Invalid instructions or operands\n");
return CL_EMALFDB;
}

if (bcfunc->insn_idx + BB->numInsts >= bcfunc->numInsts) {
cli_errmsg("More instructions than declared in total: %u > %u!\n",
bcfunc->insn_idx + BB->numInsts, bcfunc->numInsts);
return CL_EMALFDB;
}

inst.interp_op = inst.opcode * 5;
if (inst.type > 1) {
if (inst.type <= 8)
Expand Down
Loading