summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2018-06-07 16:24:31 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2018-06-07 16:24:31 +0100
commit7b9822bffe67da2a43a82d12caf5db00a3ed71c2 (patch)
treefba2cc01726c5f639f3ed6c9388d0271b58b82b6
parente60572454b5b9aab9bf1b050a73360674cd7af4e (diff)
ARC: Fix signing for case when DKIM signing failed
-rw-r--r--doc/doc-txt/ChangeLog3
-rw-r--r--src/src/arc.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 881d24c25..36f2d7048 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -49,6 +49,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/10 Fix ARC signing for case when DKIM signing failed. Previously this would
+ segfault.
+
Exim version 4.91
-----------------
diff --git a/src/src/arc.c b/src/src/arc.c
index dd2ad51b0..466c13990 100644
--- a/src/src/arc.c
+++ b/src/src/arc.c
@@ -1705,7 +1705,7 @@ if (g)
/* 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;