From 481d1b7560df30f3e9f7b1ec86349d77ce224b5d Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Thu, 18 Jan 2007 17:27:10 +0000
Subject: 23114: ${foo:s/bar/rod} broken

---
 Src/subst.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Src/subst.c')

diff --git a/Src/subst.c b/Src/subst.c
index 2bc6d75a6..cee2e6e5c 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -3477,7 +3477,11 @@ modify(char **str, char **ptr)
 			chuck(tt--);
 		*ptr1end = sav1;
 		*ptr3 = sav;
-		*ptr = ptr3 + charlen - 1;
+		*ptr = ptr3 - 1;
+		if (*ptr3) {
+		    /* Final terminator is optional. */
+		    *ptr += charlen;
+		}
 		break;
 
 	    case '&':
-- 
cgit 1.4.1