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

cmd/go/internal/load: make check for path in import error more robust

Browse Source 
When producing an ImportPathError from ImportErrorf, we check to see
whether the error string contains the path for the error. The issue is
that we were checking for the exact path string when sometimes the
string is quoted when the error is constructed, and the escaping in the
quote may not match the path string. Check for both the path string, and
the quoted path string.

Fixes #68737

Change-Id: I01bf4e495056e929570bc11bc1f2000ce6d2802b
Reviewed-on: https://go-review.googlesource.com/c/go/+/603475
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Sam Thanawalla <samthanawalla@google.com>
This commit is contained in:
Michael Matloob 2024-08-06 12:42:34 -04:00
parent b62342216d
commit 44ed517c42
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/go/internal/load/pkg.go
View File

@ -539,7 +539,7 @@ type importError struct {
func ImportErrorf(path, format string, args ...any) ImportPathError {
err := &importError{importPath: path, err: fmt.Errorf(format, args...)}
if errStr := err.Error(); !strings.Contains(errStr, path) {
if errStr := err.Error(); !strings.Contains(errStr, path) && !strings.Contains(errStr, strconv.Quote(path)) {
panic(fmt.Sprintf("path %q not in error %q", path, errStr))
}
return err

7
src/cmd/go/testdata/script/list_panic_issue68737.txt vendored Normal file
View File

@ -0,0 +1,7 @@
# Issue #68737: Don't panic if the import path string doesn't appear
# in the import error. The string may not appear because it may be
# escaped when quoted as part of the error message.
! go run '' # Quote contains 0x01 byte
! stderr panic
stderr 'malformed import path "\\x01": invalid char ''\\x01'''