qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 07:40:04 -07:00
Code Releases Activity

cmd/go: do not panic on invalid import path containing "/vendor/"

Browse Source 
Fixes #11414

Change-Id: I45a41b98554f00362d9222e9c68a441dbfc23cb8
Reviewed-on: https://go-review.googlesource.com/11700
Reviewed-by: Russ Cox <rsc@golang.org>
This commit is contained in:
Daniel Theophanes 2015-06-29 10:08:58 -07:00 committed by Russ Cox
parent 72970f7f52
commit 06b280214c
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmd/go/pkg.go
View File

@ -552,7 +552,11 @@ func disallowVendorVisibility(srcDir string, p *Package, stk *importStack) *Pack
if i > 0 {
i-- // rewind over slash in ".../vendor"
}
parent := p.Dir[:i+len(p.Dir)-len(p.ImportPath)]
truncateTo := i + len(p.Dir) - len(p.ImportPath)
if truncateTo < 0 || len(p.Dir) < truncateTo {
return p
}
parent := p.Dir[:truncateTo]
if hasPathPrefix(filepath.ToSlash(srcDir), filepath.ToSlash(parent)) {
return p
}

3
src/cmd/go/testdata/src/vend/x/invalid/invalid.go vendored Normal file
View File

@ -0,0 +1,3 @@
package invalid
import "vend/x/invalid/vendor/foo"

11
src/cmd/go/vendor_test.go
View File

@ -29,6 +29,7 @@ func TestVendorImports(t *testing.T) {
vend/vendor/q []
vend/vendor/strings []
vend/x [vend/x/vendor/p vend/vendor/q vend/x/vendor/r]
vend/x/invalid [vend/x/invalid/vendor/foo]
vend/x/vendor/p []
vend/x/vendor/p/p [notfound]
vend/x/vendor/r []
@ -64,6 +65,16 @@ func TestVendorTest(t *testing.T) {
tg.grepStdout("TestMsgExternal", "missing use in external test")
}
func TestVendorInvalid(t *testing.T) {
tg := testgo(t)
defer tg.cleanup()
tg.setenv("GOPATH", filepath.Join(tg.pwd(), "testdata"))
tg.setenv("GO15VENDOREXPERIMENT", "1")
tg.runFail("build", "vend/x/invalid")
tg.grepStderr("must be imported as foo", "missing vendor import error")
}
func TestVendorImportError(t *testing.T) {
tg := testgo(t)
defer tg.cleanup()