From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Fri, 3 Jun 2022 14:34:03 +0000 (+0100)
Subject: SRS: avoid expanding ${srs_encode...} when guarded by ${if...}
X-Git-Tag: exim-4.96-RC2~2
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/3aa5fb00be821a198f42c69924ae02b393ac2b4b

SRS: avoid expanding ${srs_encode...} when guarded by ${if...}
---

diff --git a/src/src/expand.c b/src/src/expand.c
index 06dc58cb1..36c9f423b 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -6942,6 +6942,7 @@ while (*s)
         case 2:
         case 3: goto EXPAND_FAILED;
         }
+      if (skipping) continue;
 
       if (sub[1] && *(sub[1]))
 	{
@@ -7011,7 +7012,6 @@ while (*s)
       else
 	DEBUG(D_expand) debug_printf_indent("null return_path for srs-encode\n");
 
-      if (skipping) continue;
       break;
       }
 #endif /*SUPPORT_SRS*/