ARC: Fix signing for case when DKIM signing failed

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 5fb0149dc6834bf2906850e0e78d45dadd56621b..63bcf0c20e8b2870b36cb2913bb88905a67c4cd2 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -34,6 +34,9 @@ JH/08 When generating a selfsigned cert, use serial number 1 since zero is not
 JH/09 Bug 2274: Fix logging of cmdline args when starting in an unlinked cwd.
       Previously this would segfault.
 
 JH/09 Bug 2274: Fix logging of cmdline args when starting in an unlinked cwd.
       Previously this would segfault.
 

+JH/10 Fix ARC signing for case when DKIM signing failed.  Previously this would
+      segfault.
+

 
 Exim version 4.91
 -----------------
 
 Exim version 4.91
 -----------------

diff --git a/src/src/arc.c b/src/src/arc.c
index a8562a7258f5c84b1a96fd235e10e8efc72d93cc..c2e7e5080a1dce815478c0bf75018cb0436ca646 100644 (file)
--- a/src/src/arc.c
+++ b/src/src/arc.c
@@ -1638,7 +1638,7 @@ if (g)
 
 /* Finally, append the dkim headers and return the lot. */
 
 
 /* Finally, append the dkim headers and return the lot. */
 

-g = string_catn(g, sigheaders->s, sigheaders->ptr);
+if (sigheaders) g = string_catn(g, sigheaders->s, sigheaders->ptr);

 (void) string_from_gstring(g);
 gstring_reset_unused(g);
 return g;
 (void) string_from_gstring(g);
 gstring_reset_unused(g);
 return g;