Skip to content

Commit d2eb929

Browse files
authored
Merge pull request #14 from mattn/close-file
Close file
2 parents a95a3c1 + a49cc74 commit d2eb929

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

config.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,8 @@ func (ctx *ConfigReaderContext) extractCertPool(certPoolConfig interface{}, path
408408
return nil, errors.Errorf("%s: failed to open %s", ctx.Filename, fileOrDirectory)
409409
}
410410
if err == nil {
411+
defer f.Close()
412+
411413
var traverse func(f *os.File) error
412414
traverse = func(f *os.File) error {
413415
st, err := f.Stat()
@@ -425,6 +427,7 @@ func (ctx *ConfigReaderContext) extractCertPool(certPoolConfig interface{}, path
425427
if err != nil {
426428
return errors.Wrapf(err, "%s: failed to open %s", ctx.Filename, cp)
427429
}
430+
defer cf.Close()
428431
err = traverse(cf)
429432
if err != nil {
430433
return err
@@ -576,6 +579,8 @@ func (ctx *ConfigReaderContext) extractCertPrivateKeyPairs(certConfigMap map[int
576579
return
577580
}
578581
if err == nil {
582+
defer f.Close()
583+
579584
var pemBytes []byte
580585
pemBytes, err = ioutil.ReadAll(f)
581586
if err != nil {
@@ -645,6 +650,8 @@ func (ctx *ConfigReaderContext) extractCertPrivateKeyPairs(certConfigMap map[int
645650
return
646651
}
647652
if err == nil {
653+
defer f.Close()
654+
648655
var pemBytes []byte
649656
pemBytes, err = ioutil.ReadAll(f)
650657
if err != nil {
@@ -1034,6 +1041,8 @@ func loadConfig(yamlFile string, progname string) (*Config, error) {
10341041
if err != nil {
10351042
return nil, errors.Wrapf(err, "failed to load %s", yamlFile)
10361043
}
1044+
defer f.Close()
1045+
10371046
configMap := make(map[string]interface{})
10381047
err = yaml.NewDecoder(f).Decode(&configMap)
10391048
if err != nil {

0 commit comments

Comments
 (0)