[exim-cvs] ARC: Fix signing for case when DKIM signing faile…

Gitweb: https://git.exim.org/exim.git/commitdiff/7b9822bffe67da2a43a82d12caf5db00a3ed71c2

Commit:     7b9822bffe67da2a43a82d12caf5db00a3ed71c2
Parent:     e60572454b5b9aab9bf1b050a73360674cd7af4e
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Jun 7 16:24:31 2018 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu Jun 7 16:24:31 2018 +0100

    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 881d24c..36f2d70 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 dd2ad51..466c139 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;