From: Andrew Gerrand <adg@golang.org>
Date: Fri, 21 Sep 2012 19:54:29 +0000 (+1000)
Subject: [release-branch.go1] syscall: fix plan9 build broken by CL 6458050
X-Git-Tag: go1.0.3~109
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c64554169171a41a7dfa7ef01c188e630a226702;p=gostls13.git

[release-branch.go1] syscall: fix plan9 build broken by CL 6458050
---

diff --git a/src/pkg/syscall/exec_plan9.go b/src/pkg/syscall/exec_plan9.go
index 5be3c4a173..6a92d0bb60 100644
--- a/src/pkg/syscall/exec_plan9.go
+++ b/src/pkg/syscall/exec_plan9.go
@@ -420,11 +420,9 @@ func forkExec(argv0 string, argv []string, attr *ProcAttr) (pid int, err error)
 			if err != nil {
 				return 0, err
 			}
-			envvalue, err := bytePtrFromString(v[i+1:])
-			if err != nil {
-				return 0, err
-			}
-			envvParsed = append(envvParsed, envItem{envname, envvalue, len(v) - i})
+			envvalue := make([]byte, len(v)-i)
+			copy(envvalue, v[i+1:])
+			envvParsed = append(envvParsed, envItem{envname, &envvalue[0], len(v) - i})
 		}
 	}