mirror/clamav
1
0
Fork 0
mirror of https://github.com/Cisco-Talos/clamav.git synced 2026-05-08 07:36:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix CIDs 11109, 11110, 11122, 11123, 11353, 11354, 11355, 11356, 11357, 11358, 11359, 11360, 11361, 11362, 11363, 11364, 11365, 11374, 11375

Browse Source
This commit is contained in:
Shawn Webb
2013-02-07 15:41:34 -05:00
parent 1e41fdba27
commit 59a603828b
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
freshclam/manager.c
View File

@@ -2547,6 +2547,7 @@ updatecustomdb (const char *url, int *signo, const struct optstruct *opts,
if (!strncasecmp (url, "http://", 7))
{
strncpy (urlcpy, url, sizeof (urlcpy));
urlcpy[sizeof(urlcpy)-1] = '\0';
host = &urlcpy[7];
if (!(pt = strchr (host, '/')))
{

1
libclamav/macho.c
View File

@@ -347,6 +347,7 @@ int cli_scanmacho(cli_ctx *ctx, struct cli_exe_info *fileinfo)
at += sizeof(segment_cmd64);
nsects = EC32(segment_cmd64.nsects, conv);
strncpy(name, segment_cmd64.segname, sizeof(name));
name[sizeof(name)-1] = '\0';
} else {
if(fmap_readn(map, &segment_cmd, at, sizeof(segment_cmd)) != sizeof(segment_cmd)) {
cli_dbgmsg("cli_scanmacho: Can't read segment command\n");

26
libclamav/readdb.c
View File

@@ -2393,14 +2393,14 @@ static int cli_loadcrt(FILE *fs, struct cl_engine *engine, struct cli_dbio *dbio
tokens_count = cli_strtokenize(buffer, ';', CRT_TOKENS + 1, (const char **)tokens);
if (tokens_count > CRT_TOKENS || tokens_count < CRT_TOKENS - 2) {
cli_errmsg("cli_loadcrt: line %u: Invalid number of tokens: %u\n", line, tokens_count);
cli_errmsg("cli_loadcrt: line %u: Invalid number of tokens: %u\n", (unsigned int)line, (unsigned int)tokens_count);
ret = CL_EMALFDB;
goto end;
}
if (tokens_count > CRT_TOKENS - 2) {
if (!cli_isnumber(tokens[CRT_TOKENS-1])) {
cli_errmsg("cli_loadcrt: line %u: Invalid minimum feature level\n", line);
cli_errmsg("cli_loadcrt: line %u: Invalid minimum feature level\n", (unsigned int)line);
ret = CL_EMALFDB;
goto end;
}
@@ -2411,7 +2411,7 @@ static int cli_loadcrt(FILE *fs, struct cl_engine *engine, struct cli_dbio *dbio
if (tokens_count == CRT_TOKENS) {
if (!cli_isnumber(tokens[CRT_TOKENS])) {
cli_errmsg("cli_loadcrt: line %u: Invalid maximum feature level\n", line);
cli_errmsg("cli_loadcrt: line %u: Invalid maximum feature level\n", (unsigned int)line);
ret = CL_EMALFDB;
goto end;
}
@@ -2431,7 +2431,7 @@ static int cli_loadcrt(FILE *fs, struct cl_engine *engine, struct cli_dbio *dbio
ca.isBlacklisted = 1;
break;
default:
cli_errmsg("cli_loadcrt: line %u: Invalid trust specification. Expected 0 or 1\n", line);
cli_errmsg("cli_loadcrt: line %u: Invalid trust specification. Expected 0 or 1\n", (unsigned int)line);
ret = CL_EMALFDB;
goto end;
}
@@ -2440,33 +2440,33 @@ static int cli_loadcrt(FILE *fs, struct cl_engine *engine, struct cli_dbio *dbio
if (strlen(tokens[3])) {
serial = cli_hex2str(tokens[3]);
if (!serial) {
cli_errmsg("cli_loadcrt: line %u: Cannot convert serial to binary string\n", line);
cli_errmsg("cli_loadcrt: line %u: Cannot convert serial to binary string\n", (unsigned int)line);
ret = CL_EMALFDB;
goto end;
}
memcpy(ca.serial, serial, sizeof(ca.serial));
free(serial);
} else {
memset(ca.serial, '\xca', sizeof(ca.serial));
memset(ca.serial, (int)'\xca', sizeof(ca.serial));
}
pubkey = cli_hex2str(tokens[4]);
cli_dbgmsg("cli_loadcrt: subject: %s\n", tokens[2]);
cli_dbgmsg("cli_loadcrt: public key: %s\n", tokens[4]);
if (!subject) {
cli_errmsg("cli_loadcrt: line %u: Cannot convert subject to binary string\n", line);
cli_errmsg("cli_loadcrt: line %u: Cannot convert subject to binary string\n", (unsigned int)line);
ret = CL_EMALFDB;
goto end;
}
if (!pubkey) {
cli_errmsg("cli_loadcrt: line %u: Cannot convert public key to binary string\n", line);
cli_errmsg("cli_loadcrt: line %u: Cannot convert public key to binary string\n", (unsigned int)line);
ret = CL_EMALFDB;
goto end;
}
memcpy(ca.subject, subject, sizeof(ca.subject));
if (mp_read_unsigned_bin(&(ca.n), pubkey, strlen(tokens[4])/2) || mp_read_unsigned_bin(&(ca.e), exp, sizeof(exp)-1)) {
cli_errmsg("cli_loadcrt: line %u: Cannot convert exponent to binary data\n", line);
cli_errmsg("cli_loadcrt: line %u: Cannot convert exponent to binary data\n", (unsigned int)line);
ret = CL_EMALFDB;
goto end;
}
@@ -2479,7 +2479,7 @@ static int cli_loadcrt(FILE *fs, struct cl_engine *engine, struct cli_dbio *dbio
ca.codeSign = 0;
break;
default:
cli_errmsg("cli_loadcrt: line %u: Invalid code sign specification. Expected 0 or 1\n", line);
cli_errmsg("cli_loadcrt: line %u: Invalid code sign specification. Expected 0 or 1\n", (unsigned int)line);
ret = CL_EMALFDB;
goto end;
}
@@ -2492,7 +2492,7 @@ static int cli_loadcrt(FILE *fs, struct cl_engine *engine, struct cli_dbio *dbio
ca.timeSign = 0;
break;
default:
cli_errmsg("cli_loadcrt: line %u: Invalid time sign specification. Expected 0 or 1\n", line);
cli_errmsg("cli_loadcrt: line %u: Invalid time sign specification. Expected 0 or 1\n", (unsigned int)line);
ret = CL_EMALFDB;
goto end;
}
@@ -2505,7 +2505,7 @@ static int cli_loadcrt(FILE *fs, struct cl_engine *engine, struct cli_dbio *dbio
ca.certSign = 0;
break;
default:
cli_errmsg("cli_loadcrt: line %u: Invalid cert sign specification. Expected 0 or 1\n", line);
cli_errmsg("cli_loadcrt: line %u: Invalid cert sign specification. Expected 0 or 1\n", (unsigned int)line);
ret = CL_EMALFDB;
goto end;
}
@@ -2515,6 +2515,8 @@ static int cli_loadcrt(FILE *fs, struct cl_engine *engine, struct cli_dbio *dbio
ca.not_after = (-1U)>>1;
crtmgr_add(&(engine->cmgr), &ca);
free(subject);
free(pubkey);
}
end:

4
libclamav/scanners.c
View File

@@ -1891,8 +1891,8 @@ static void get_thread_times(uint64_t *kt, uint64_t *ut)
struct tms tbuf;
if (times(&tbuf) != -1) {
clock_t tck = sysconf(_SC_CLK_TCK);
*kt = 1000000UL*tbuf.tms_stime / tck;
*ut = 1000000UL*tbuf.tms_utime / tck;
*kt = ((uint64_t)1000000)*tbuf.tms_stime / tck;
*ut = ((uint64_t)1000000)*tbuf.tms_utime / tck;
} else {
*kt = *ut = 0;
}