Skip to content

Commit b13ce66

Browse files
Richard MillerBryan C. Mills
Richard Miller
authored and
Bryan C. Mills
committed
cmd/go/internal/modload: use lockedfile to read path-replacement go.mod files
When parsing go.mod files found via file-path replacements, it's safer to use lockedfile.Read instead of ioutil.ReadFile, in case of overwriting by other concurrent go commands. Change-Id: I7dcac3bb5ada84bee1eb634b39f813c461ef103a Reviewed-on: https://go-review.googlesource.com/c/go/+/230838 Reviewed-by: Bryan C. Mills <[email protected]> Reviewed-by: Jay Conrod <[email protected]> Run-TryBot: Bryan C. Mills <[email protected]>
1 parent 202c43b commit b13ce66

File tree

1 file changed

+2
-2
lines changed
  • src/cmd/go/internal/modload

1 file changed

+2
-2
lines changed

Diff for: src/cmd/go/internal/modload/mvs.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ package modload
77
import (
88
"errors"
99
"fmt"
10-
"io/ioutil"
1110
"os"
1211
"path/filepath"
1312
"sort"
1413
"sync"
1514

1615
"cmd/go/internal/base"
1716
"cmd/go/internal/cfg"
17+
"cmd/go/internal/lockedfile"
1818
"cmd/go/internal/modfetch"
1919
"cmd/go/internal/mvs"
2020
"cmd/go/internal/par"
@@ -108,7 +108,7 @@ func (r *mvsReqs) required(mod module.Version) ([]module.Version, error) {
108108
dir = filepath.Join(ModRoot(), dir)
109109
}
110110
gomod := filepath.Join(dir, "go.mod")
111-
data, err := ioutil.ReadFile(gomod)
111+
data, err := lockedfile.Read(gomod)
112112
if err != nil {
113113
return nil, fmt.Errorf("parsing %s: %v", base.ShortPath(gomod), err)
114114
}

0 commit comments

Comments
 (0)