Skip to content

Commit c069892

Browse files
Adding missing file closes
1 parent 7492195 commit c069892

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

internal/buffer/buffer.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ func (b *Buffer) ReOpen() error {
537537
if err != nil {
538538
return err
539539
}
540+
defer file.Close()
540541

541542
enc, err := htmlindex.Get(b.Settings["encoding"].(string))
542543
if err != nil {

internal/buffer/save.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -342,11 +342,7 @@ func (b *Buffer) saveToFile(filename string, withSudo bool, autoSave bool) error
342342
// This means that the file is not overwritten directly but by writing to the
343343
// backup file first.
344344
func (b *Buffer) safeWrite(path string, withSudo bool, newFile bool) (int, error) {
345-
file, err := openFile(path, withSudo)
346-
if err != nil {
347-
return 0, err
348-
}
349-
345+
var err error
350346
defer func() {
351347
if newFile && err != nil {
352348
os.Remove(path)
@@ -370,9 +366,15 @@ func (b *Buffer) safeWrite(path string, withSudo bool, newFile bool) (int, error
370366
return 0, err
371367
}
372368

369+
file, err := openFile(path, withSudo)
370+
if err != nil {
371+
return 0, err
372+
}
373+
373374
b.forceKeepBackup = true
374375
size, err := file.Write(b)
375376
if err != nil {
377+
file.Close()
376378
err = util.OverwriteError{err, backupName}
377379
return size, err
378380
}

0 commit comments

Comments
 (0)