Stowage/clamav
2
0
Fork 0
mirror of https://github.com/Cisco-Talos/clamav.git synced 2025-10-19 10:23:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

moved virusaction(...) calls before conn_reply(...)

Browse source
This commit is contained in:
Kenneth Hau 2021-05-08 16:34:22 -05:00 • committed by Micah Snyder
parent 4b400b9b1e
commit 17cf264d43
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
clamd/scanner.c
View file

@ -301,6 +301,7 @@ cl_error_t scan_callback(STATBUF *sb, char *filename, const char *msg, enum cli_
virusaction(filename, virname, scandata->opts);
} else {
scandata->infected++;
virusaction(filename, virname, scandata->opts);
if (conn_reply_virus(scandata->conn, filename, virname) == -1) {
free(filename);
return CL_ETIMEOUT;
@ -313,7 +314,6 @@ cl_error_t scan_callback(STATBUF *sb, char *filename, const char *msg, enum cli_
logg("~%s: %s(%s:%llu) FOUND\n", filename, virname, context.virhash, context.virsize);
else
logg("~%s: %s FOUND\n", filename, virname);
virusaction(filename, virname, scandata->opts);
}
} else if (ret != CL_CLEAN) {
scandata->errors++;
@ -437,13 +437,13 @@ cl_error_t scanfd(
}
if (ret == CL_VIRUS) {
virusaction(log_filename, virname, opts);
if (conn_reply_virus(conn, reply_fdstr, virname) == -1)
ret = CL_ETIMEOUT;
if (context.virsize && optget(opts, "ExtendedDetectionInfo")->enabled)
logg("%s: %s(%s:%llu) FOUND\n", log_filename, virname, context.virhash, context.virsize);
else
logg("%s: %s FOUND\n", log_filename, virname);
virusaction(log_filename, virname, opts);
} else if (ret != CL_CLEAN) {
if (conn_reply(conn, reply_fdstr, cl_strerror(ret), "ERROR") == -1)
ret = CL_ETIMEOUT;