From c06bd52a2e5a38125635b770b5ddad2cb3ce6909 Mon Sep 17 00:00:00 2001
From: Alex Brainman <alex.brainman@gmail.com>
Date: Sun, 5 Feb 2012 15:16:39 +1100
Subject: [PATCH] cmd/dist: fix bug in bsubst

R=golang-dev, r, dsymonds, akumar
CC=golang-dev
https://golang.org/cl/5624054
---
 src/cmd/dist/buf.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 src/cmd/dist/buf.c

diff --git a/src/cmd/dist/buf.c b/src/cmd/dist/buf.c
old mode 100644
new mode 100755
index c990c8af78..45fb1954d3
--- a/src/cmd/dist/buf.c
+++ b/src/cmd/dist/buf.c
@@ -115,8 +115,11 @@ bsubst(Buf *b, char *x, char *y)
 		if(p == nil)
 			break;
 		if(nx != ny) {
-			if(nx < ny)
+			if(nx < ny) {
+				pos = p - b->p;
 				bgrow(b, ny-nx);
+				p = b->p + pos;
+			}
 			xmemmove(p+ny, p+nx, (b->p+b->len)-(p+nx));
 		}
 		xmemmove(p, y, ny);
-- 
2.48.1