summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/doc-txt/ChangeLog6
-rw-r--r--src/src/malware.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index b0e013c46..9feb5a7ac 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -31,6 +31,8 @@ PP/07 If TLS negotiated an anonymous cipher, we could end up with SSL but
PP/08 Bugzilla 926: switch ClamAV to use the new zINSTREAM API for content
filtering; old API available if built with WITH_OLD_CLAMAV_STREAM=yes
NB: ClamAV planning to remove STREAM in "middle of 2010".
+ CL also introduces -bmalware, various -d+acl logging additions and
+ more caution in buffer sizes.
PP/09 Implemented reverse_ip expansion operator.
@@ -55,6 +57,10 @@ JJ/02 prevent non-panic DKIM error from being sent to paniclog
JJ/03 added tcp_wrappers_daemon_name to allow host entries other than
"exim" to be used
+PP/17 Fix malware regression for cmdline scanner introduced in PP/08.
+ Notification from Dr Andrew Aitchison.
+
+
Exim version 4.72
-----------------
diff --git a/src/src/malware.c b/src/src/malware.c
index f82bef63e..6e8b3f36d 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -1098,7 +1098,8 @@ static int malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking)
"malware filename does not fit in buffer [malware_internal() cmdline]");
return DEFER;
}
- p = Ustrrchr(eml_filename, '/');
+ Ustrcpy(file_name, eml_filename);
+ p = Ustrrchr(file_name, '/');
if (p)
*p = '\0';
fits = string_format(commandline, sizeof(commandline), CS cmdline_scanner, file_name);