cli/config/configfile: Make sure to not leak a temp config behind.

tsuna · tsuna · commit 6bb039d0280f · 2018-09-11T17:20:29.000-07:00
In the unlikely event that we fail to rename the temp config file to the
destination file, don't leave the temp config file behind as this could
cause temp files to pile up in ~/.docker for example if there is a
permission problem.

Signed-off-by: Benoit Sigoure &lt;tsunanet@gmail.com&gt;
diff --git a/cli/config/configfile/file.go b/cli/config/configfile/file.go
@@ -183,10 +183,10 @@ func (configFile *ConfigFile) Save() error {
 	if err != nil {
 		return err
 	}
+	defer os.Remove(temp.Name())
 	err = configFile.SaveToWriter(temp)
 	temp.Close()
 	if err != nil {
-		os.Remove(temp.Name())
 		return err
 	}
 	return os.Rename(temp.Name(), configFile.Filename)

Original file line number	Diff line number	Diff line change
`@@ -183,10 +183,10 @@ func (configFile *ConfigFile) Save() error {`
`183`	`183`	`if err != nil {`
`184`	`184`	`return err`
`185`	`185`	`}`
	`186`	`+ defer os.Remove(temp.Name())`
`186`	`187`	`err = configFile.SaveToWriter(temp)`
`187`	`188`	`temp.Close()`
`188`	`189`	`if err != nil {`
`189`		`- os.Remove(temp.Name())`
`190`	`190`	`return err`
`191`	`191`	`}`
`192`	`192`	`return os.Rename(temp.Name(), configFile.Filename)`