Fix ${tr...} and empty-strings. Bug 3023

[exim.git] / src / src / expand.c

diff --git a/src/src/expand.c b/src/src/expand.c
index b4a76b3e7649f9573fcb720cd4a6ed711a6652a3..aa8bfe643b9494c6e6de86a8c4ab2728a6482784 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -5807,16 +5807,15 @@ while (*s)
         case 3: goto EXPAND_FAILED;
         }
 
-      yield = string_cat(yield, sub[0]);
-      o2m = Ustrlen(sub[2]) - 1;
-
-      if (o2m >= 0) for (; oldptr < yield->ptr; oldptr++)
+      if (  (yield = string_cat(yield, sub[0]))
+         && (o2m = Ustrlen(sub[2]) - 1) >= 0)
+         for (; oldptr < yield->ptr; oldptr++)
         {
         uschar * m = Ustrrchr(sub[1], yield->s[oldptr]);
         if (m)
           {
           int o = m - sub[1];
-          yield->s[oldptr] = sub[2][(o < o2m)? o : o2m];
+          yield->s[oldptr] = sub[2][o < o2m ? o : o2m];
           }
         }