]> Cypherpunks repositories - gostls13.git/commitdiff
[release-branch.go1] syscall: fix plan9 build broken by CL 6458050
authorAndrew Gerrand <adg@golang.org>
Fri, 21 Sep 2012 19:54:29 +0000 (05:54 +1000)
committerAndrew Gerrand <adg@golang.org>
Fri, 21 Sep 2012 19:54:29 +0000 (05:54 +1000)
src/pkg/syscall/exec_plan9.go

index 5be3c4a1734de9a98d7d575c3367486ef95b6744..6a92d0bb60b1df870fa0649c450c2bc61a37ecc6 100644 (file)
@@ -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})
                }
        }