From ebf2c3666fd2e9bbb208dbeb297a901ba287c72c Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 7 Jun 2018 16:24:31 +0100 Subject: [PATCH 1/1] ARC: Fix signing for case when DKIM signing failed --- doc/doc-txt/ChangeLog | 3 +++ src/src/arc.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 5fb0149dc..63bcf0c20 100644 --- 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/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 a8562a725..c2e7e5080 100644 --- 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. */ -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; -- 2.30.2