Null initialise DKIM variable. Fixes: #986

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index a1168b01c6c8399b293fa52d5b872aa4d3ff1887..a2434129c19b894c1f813dc09909418dc28d529d 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.609 2010/05/29 17:09:09 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.610 2010/05/29 19:16:50 nm4 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -36,6 +36,8 @@ MH/01 Treat the transport option dkim_domain as a colon separated
       list, not as a single string, and sign the message with each element,
       omitting multiple occurences of the same signer.
 
       list, not as a single string, and sign the message with each element,
       omitting multiple occurences of the same signer.
 

+NM/07 Null terminate DKIM strings, Null initialise DKIM variable
+      Bugzilla 985, 986.  Patch by Simon Arlott

 
 
 Exim version 4.71
 
 
 Exim version 4.71

diff --git a/src/src/dkim.c b/src/src/dkim.c
index f88f910f97a452c1c6027ce4f8816a59f6d2a783..ca46805e82723b17e3839233c8cbad5a81154515 100644 (file)
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/dkim.c,v 1.13 2010/02/19 10:30:13 michael Exp $ */
+/* $Cambridge: exim/src/src/dkim.c,v 1.14 2010/05/29 19:16:50 nm4 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -467,7 +467,10 @@ uschar *dkim_exim_sign(int dkim_fd,
         goto CLEANUP;
       }
     }
         goto CLEANUP;
       }
     }

-    /* else pass NULL, which means default header list */
+    else {
+      /* pass NULL, which means default header list */
+      dkim_sign_headers_expanded = NULL;
+    }

 
     /* Get private key to use. */
     dkim_private_key_expanded = expand_string(dkim_private_key);
 
     /* Get private key to use. */
     dkim_private_key_expanded = expand_string(dkim_private_key);