aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/go/internal/modcmd/edit.go
diff options
context:
space:
mode:
authorUdalov Max <re.udalov@gmail.com>2019-04-23 12:53:35 +0300
committerJay Conrod <jayconrod@google.com>2019-04-24 00:09:18 +0000
commitde050717f1b668dfd196f1dc4d18c77d03f3afb4 (patch)
tree5d5929e298124e4e91b3915c7045f827f96f4762 /src/cmd/go/internal/modcmd/edit.go
parent601eee39de1f9d215274f54d57af80ee163e11f1 (diff)
downloadgo-de050717f1b668dfd196f1dc4d18c77d03f3afb4.tar.gz
go-de050717f1b668dfd196f1dc4d18c77d03f3afb4.zip
cmd/go/internal/modcmd: assign module's path and version to fileJSON when modFile's module statement exists
Fixes panic on nil pointer dereference error when assigning module's path and version pair to fileJSON. Fixes #31623 Change-Id: I3f61122ba0676a1270d3ad98900af8c8e9c90935 Reviewed-on: https://go-review.googlesource.com/c/go/+/173397 Run-TryBot: Jay Conrod <jayconrod@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Jay Conrod <jayconrod@google.com>
Diffstat (limited to 'src/cmd/go/internal/modcmd/edit.go')
-rw-r--r--src/cmd/go/internal/modcmd/edit.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cmd/go/internal/modcmd/edit.go b/src/cmd/go/internal/modcmd/edit.go
index 5066e4ddf7..1be8b7cb2f 100644
--- a/src/cmd/go/internal/modcmd/edit.go
+++ b/src/cmd/go/internal/modcmd/edit.go
@@ -385,7 +385,9 @@ type replaceJSON struct {
// editPrintJSON prints the -json output.
func editPrintJSON(modFile *modfile.File) {
var f fileJSON
- f.Module = modFile.Module.Mod
+ if modFile.Module != nil {
+ f.Module = modFile.Module.Mod
+ }
if modFile.Go != nil {
f.Go = modFile.Go.Version
}