Adding missing file closes

Author: Neko-Box-Coder

internal/buffer/buffer.go

@@ -537,6 +537,7 @@ func (b *Buffer) ReOpen() error {
 	if err != nil {
 		return err
 	}
+	defer file.Close()
 
 	enc, err := htmlindex.Get(b.Settings["encoding"].(string))
 	if err != nil {

internal/buffer/save.go

@@ -342,17 +342,6 @@ func (b *Buffer) saveToFile(filename string, withSudo bool, autoSave bool) error
 // This means that the file is not overwritten directly but by writing to the
 // backup file first.
 func (b *Buffer) safeWrite(path string, withSudo bool, newFile bool) (int, error) {
-	file, err := openFile(path, withSudo)
-	if err != nil {
-		return 0, err
-	}
-
-	defer func() {
-		if newFile && err != nil {
-			os.Remove(path)
-		}
-	}()
-
 	backupDir := b.backupDir()
 	if _, err := os.Stat(backupDir); err != nil {
 		if !errors.Is(err, fs.ErrNotExist) {
@@ -364,15 +353,27 @@ func (b *Buffer) safeWrite(path string, withSudo bool, newFile bool) (int, error
 	}
 
 	backupName := util.DetermineEscapePath(backupDir, path)
-	_, err = b.overwriteFile(backupName)
+	_, err := b.overwriteFile(backupName)
 	if err != nil {
 		os.Remove(backupName)
 		return 0, err
 	}
 
+	file, err := openFile(path, withSudo)
+	if err != nil {
+		return 0, err
+	}
+
+	defer func() {
+		if newFile && err != nil {
+			os.Remove(path)
+		}
+	}()
+
 	b.forceKeepBackup = true
 	size, err := file.Write(b)
 	if err != nil {
+		file.Close()
 		err = util.OverwriteError{err, backupName}
 		return size, err
 	}