FreeBSD: fix sendfile shim

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 6d78cd320401f53f6f61c1f16d964e973d42334c..4e0d602dd278cda8831cbd50128a069155568737 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -18,6 +18,9 @@ JH/03 Constification work in the filters module required a major version
       global which is visible via the API is now const and may therefore
       not be modified by local-scan code.
 
+JH/04 Fix ClamAV TCP use under FreeBSD. Previously the OS-specific shim for
+      sendfile() didi not account for the way the ClamAV driver code called it.
+
 
 Exim version 4.95
 -----------------

diff --git a/src/OS/os.c-FreeBSD b/src/OS/os.c-FreeBSD
index cb0b0bf7fb5f190a8a6c72317e350014c081e389..38df91cf4f0e79da324d74df8ba029931c2c52c0 100644 (file)
--- a/src/OS/os.c-FreeBSD
+++ b/src/OS/os.c-FreeBSD
@@ -19,7 +19,7 @@ os_sendfile(int out, int in, off_t * offp, size_t cnt)
 off_t loff = *offp, written;
 
 if (sendfile(in, out, loff, cnt, NULL, &written, 0) < 0) return (ssize_t)-1;
-*offp = loff + written;
+if (offp) *offp = loff + written;
 return (ssize_t)written;
 }