From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 12 Feb 2017 16:44:09 +0000 (+0000)
Subject: DKIM: fix crash with a verification when dkim disabled, under CHUNKING
X-Git-Tag: exim-4.90devstart~2
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/79de4f370f306869887e1714ff4ecef5bfc93fa5

DKIM: fix crash with a verification when dkim disabled, under CHUNKING
---

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 6963e7da2..db684a646 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -486,12 +486,17 @@ uschar * log_msg;
 
 for(;;)
   {
+#ifndef DISABLE_DKIM
+  BOOL dkim_save;
+#endif
+
   if (chunking_data_left > 0)
     return lwr_receive_getc(chunking_data_left--);
 
   receive_getc = lwr_receive_getc;
   receive_ungetc = lwr_receive_ungetc;
 #ifndef DISABLE_DKIM
+  dkim_save = dkim_collect_input;
   dkim_collect_input = FALSE;
 #endif
 
@@ -592,7 +597,7 @@ next_cmd:
       receive_getc = bdat_getc;
       receive_ungetc = bdat_ungetc;
 #ifndef DISABLE_DKIM
-      dkim_collect_input = TRUE;
+      dkim_collect_input = dkim_save;
 #endif
       break;	/* to top of main loop */
       }