fix rename failed when rewrite public keys (#7761)

lunny · web-flow · commit 4328d8e8d72c · 2019-08-06T14:32:11.000+08:00
diff --git a/models/ssh_key.go b/models/ssh_key.go
@@ -685,12 +685,14 @@ func rewriteAllPublicKeys(e Engine) error {
 			}
 			_, err = t.WriteString(line + "\n")
 			if err != nil {
+				f.Close()
 				return err
 			}
 		}
-		defer f.Close()
+		f.Close()
 	}
 
+	t.Close()
 	return os.Rename(tmpPath, fPath)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -685,12 +685,14 @@ func rewriteAllPublicKeys(e Engine) error {`
`685`	`685`	`}`
`686`	`686`	`_, err = t.WriteString(line + "\n")`
`687`	`687`	`if err != nil {`
	`688`	`+ f.Close()`
`688`	`689`	`return err`
`689`	`690`	`}`
`690`	`691`	`}`
`691`		`- defer f.Close()`
	`692`	`+ f.Close()`
`692`	`693`	`}`
`693`	`694`
	`695`	`+ t.Close()`
`694`	`696`	`return os.Rename(tmpPath, fPath)`
`695`	`697`	`}`
`696`	`698`