Fix symlink-following. Bug 2909

[exim.git] / src / OS / os.c-FreeBSD

diff --git a/src/OS/os.c-FreeBSD b/src/OS/os.c-FreeBSD
index 38df91cf4f0e79da324d74df8ba029931c2c52c0..02b78587b0fb33cec865359e32d2b7357f4b12b5 100644 (file)
--- a/src/OS/os.c-FreeBSD
+++ b/src/OS/os.c-FreeBSD
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) Jeremy Harris 1995 - 2020 */
 *************************************************/
 
 /* Copyright (c) Jeremy Harris 1995 - 2020 */

+/* Copyright (c) The Exim Maintainers 2021 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* FreeBSD-specific code. This is concatenated onto the generic
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* FreeBSD-specific code. This is concatenated onto the generic


@@ -16,7 +17,8 @@ Sendfile shim
 ssize_t
 os_sendfile(int out, int in, off_t * offp, size_t cnt)
 {
 ssize_t
 os_sendfile(int out, int in, off_t * offp, size_t cnt)
 {

-off_t loff = *offp, written;
+off_t loff = offp ? *offp : 0;
+off_t written;

 
 if (sendfile(in, out, loff, cnt, NULL, &written, 0) < 0) return (ssize_t)-1;
 if (offp) *offp = loff + written;
 
 if (sendfile(in, out, loff, cnt, NULL, &written, 0) < 0) return (ssize_t)-1;
 if (offp) *offp = loff + written;