diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/expand.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/src/expand.c b/src/src/expand.c index b4a76b3e7..aa8bfe643 100644 --- 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]; } } |