qugalet/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2024-11-25 13:16:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[bugfix] close files before error return (#3163)

Browse source 
* close files before error return

* use defer statements

* shuffle around some defers
This commit is contained in:
kim 2024-08-02 14:11:24 +00:00 committed by GitHub
parent 0f734a2410
commit e5e996b28a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/media/metadata.go
View file

@ -75,12 +75,14 @@ func terminateExif(outpath, inpath string, ext string) error {
if err != nil {
return gtserror.Newf("error opening input file %s: %w", inpath, err)
}
defer inFile.Close()
// Open output file at given path.
outFile, err := os.Create(outpath)
if err != nil {
return gtserror.Newf("error opening output file %s: %w", outpath, err)
}
defer outFile.Close()
// Terminate EXIF data from 'inFile' -> 'outFile'.
err = terminator.TerminateInto(outFile, inFile, ext)
@ -88,9 +90,5 @@ func terminateExif(outpath, inpath string, ext string) error {
return gtserror.Newf("error terminating exif data: %w", err)
}
// Done with files.
_ = inFile.Close()
_ = outFile.Close()
return nil
}

12
internal/media/util.go
View file

@ -120,15 +120,17 @@ func getMimeType(ext string) string {
// chance that Linux's sendfile syscall can be utilised for optimal
// draining of data source to temporary file storage.
func drainToTmp(rc io.ReadCloser) (string, error) {
tmp, err := os.CreateTemp(os.TempDir(), "gotosocial-*")
defer rc.Close()
// Open new temporary file.
tmp, err := os.CreateTemp(
os.TempDir(),
"gotosocial-*",
)
if err != nil {
return "", err
}
// Close readers
// on func return.
defer tmp.Close()
defer rc.Close()
// Extract file path.
path := tmp.Name()