Fix NULL pointer deref when there is no message data whatsoever

[users/jgh/exim.git] / src / exim_monitor / em_globals.c

diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c
index 16c0aa413e00070f308f884cb26a3ded07ef2245..266ea86510d38612c4d5373d6d570f2e7e2e93f8 100644 (file)
--- a/src/exim_monitor/em_globals.c
+++ b/src/exim_monitor/em_globals.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/exim_monitor/em_globals.c,v 1.15 2009/06/15 19:54:32 tom Exp $ */
+/* $Cambridge: exim/src/exim_monitor/em_globals.c,v 1.16 2009/10/15 15:38:01 tom Exp $ */

 
 /*************************************************
 *                Exim Monitor                    *
 
 /*************************************************
 *                Exim Monitor                    *


@@ -136,10 +136,11 @@ int     deliver_frozen_at      = 0;
 BOOL    deliver_manual_thaw    = FALSE;
 
 #ifndef DISABLE_DKIM
 BOOL    deliver_manual_thaw    = FALSE;
 
 #ifndef DISABLE_DKIM

-uschar *dkim_signing_domains     = NULL;
+uschar *dkim_cur_signer          = NULL;
+uschar *dkim_signers             = NULL;

 uschar *dkim_signing_domain      = NULL;
 uschar *dkim_signing_selector    = NULL;
 uschar *dkim_signing_domain      = NULL;
 uschar *dkim_signing_selector    = NULL;

-uschar *dkim_verify_signers      = US"$dkim_signing_domains";
+uschar *dkim_verify_signers      = US"$dkim_signers";

 BOOL    dkim_collect_input       = FALSE;
 BOOL    dkim_disable_verify      = FALSE;
 #endif
 BOOL    dkim_collect_input       = FALSE;
 BOOL    dkim_disable_verify      = FALSE;
 #endif