summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2016-02-06 16:22:00 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2016-02-06 16:22:00 +0000
commit67e87fcf7078bb339e8ea1a81e9a12fa1c0687c8 (patch)
tree8f7e2e3a3d3bdfccb37da1a9068e4c1c31113bd7
parent66802652b8500bae10ac530b6fe4976669f5dcff (diff)
downloadexim4-67e87fcf7078bb339e8ea1a81e9a12fa1c0687c8.tar.gz
SRS: fix crash in queryprogram router when compiled with EXPERIMENTAL_SRS
-rw-r--r--doc/doc-txt/ChangeLog2
-rw-r--r--src/src/routers/queryprogram.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index b48b7b988..12a28dd20 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -166,6 +166,8 @@ JH/38 Fix cutthrough bug with body lines having a single dot. The dot was
JH/39 Bug 1781: Fix use of private-keys having trailing '=' in the base-64.
+JH/40 Fix crash in queryprogram router when compiled with EXPERIMENTAL_SRS.
+
Exim version 4.86
diff --git a/src/src/routers/queryprogram.c b/src/src/routers/queryprogram.c
index 138062e16..018e4c831 100644
--- a/src/src/routers/queryprogram.c
+++ b/src/src/routers/queryprogram.c
@@ -223,6 +223,10 @@ rc = rf_get_munge_headers(addr, rblock, &addr_prop.extra_headers,
&addr_prop.remove_headers);
if (rc != OK) return rc;
+#ifdef EXPERIMENTAL_SRS
+addr_prop.srs_sender = NULL;
+#endif
+
/* Get the fixed or expanded uid under which the command is to run
(initialization ensures that one or the other is set). */