X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2d6186e106b8cfc1d8f39355495e601832e92c56..a85c067ba6c6940512cf57ec213277a370d87e70:/src/src/dcc.c

diff --git a/src/src/dcc.c b/src/src/dcc.c
index fe2e1340f..d8e22b30c 100644
--- a/src/src/dcc.c
+++ b/src/src/dcc.c
@@ -7,13 +7,18 @@
  * wbreyha@gmx.net
  * See the file NOTICE for conditions of use and distribution.
  *
- * Copyright (c) The Exim Maintainers 2015 - 2019
+ * Copyright (c) The Exim Maintainers 2015 - 2022
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 /* Code for calling dccifd. Called from acl.c. */
 
 #include "exim.h"
 #ifdef EXPERIMENTAL_DCC
+#ifndef WITH_CONTENT_SCAN
+# error EXPERIMENTAL_DCC requires WITH_CONTENT_SCAN
+#endif
+
 #include "dcc.h"
 #include "unistd.h"
 
@@ -333,7 +338,7 @@ while((dcc_resplen = read(sockfd, big_buffer, big_buffer_size-1)) > 0)
 		 "DCC: -----------------------------------\n", dcc_resplen, dcc_resplen, big_buffer);
 
   /* Now let's read each character and see what we've got */
-  for(bufoffset = 0; bufoffset < dcc_resplen, line <= 2; bufoffset++)
+  for(bufoffset = 0; bufoffset < dcc_resplen && line <= 2; bufoffset++)
     {
     /* First check if we reached the end of the line and
     then increment the line counter */