diff options
author | Russ Cox <rsc@golang.org> | 2015-09-01 22:26:43 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-09-01 22:26:43 +0000 |
commit | c38a71e0a651f0971d1bcafe237193be2cd81c29 (patch) | |
tree | b60a44a905945100f46b6fc9184df866dbccf955 /go/loader/loader.go | |
parent | ad62f1bd4fbff4bc4ad3f425851855fee367c55c (diff) | |
parent | 93604a3dc2a5ae0168456c672ec35cc90ea881e6 (diff) | |
download | tools-c38a71e0a651f0971d1bcafe237193be2cd81c29.tar.gz |
go/loader: fix fd leak and limit calls to ioutil.ReadDirstudio-3.2.1studio-3.1.2studio-3.0studio-2.3studio-2.0-rc1studio-2.0gradle_3.1.2gradle_3.0.0gradle_2.3.0gradle_2.0.0studio-master-devmirror-goog-studio-master-dev
automerge: 93604a3
* commit '93604a3dc2a5ae0168456c672ec35cc90ea881e6':
go/loader: fix fd leak and limit calls to ioutil.ReadDir
Diffstat (limited to 'go/loader/loader.go')
-rw-r--r-- | go/loader/loader.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/go/loader/loader.go b/go/loader/loader.go index bbacc5b..1d3ead0 100644 --- a/go/loader/loader.go +++ b/go/loader/loader.go @@ -449,7 +449,9 @@ func (conf *Config) Load() (*Program, error) { conf.FindPackage = func(ctxt *build.Context, path string) (*build.Package, error) { // TODO(adonovan): cache calls to build.Import // so we don't do it three times per test package. + ioLimit <- true bp, err := ctxt.Import(path, conf.Cwd, 0) + <-ioLimit if _, ok := err.(*build.NoGoError); ok { return bp, nil // empty directory is not an error } |