Skip to content

fix: nil pointer panic in commonLock defer #4819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fedebram wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −1
Open

fix: nil pointer panic in commonLock defer #4819

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pkg/internal/filesystem/lock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ func ReadOnlyLock(path string) (file *os.File, err error) {
func commonlock(path string, mode lockType) (file *os.File, err error) {
defer func() {
if err != nil {
err = errors.Join(ErrLockFail, err, file.Close())
err = errors.Join(ErrLockFail, err)
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file still has to be closed unless it is nil

Copy link
Copy Markdown
Author

@fedebram fedebram Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, I'll add a nil check on the file.

if file != nil {
err = errors.Join(err, file.Close())
}
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda Apr 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not:

err = errors.Join(ErrLockFail, err)
if file != nil {
  err = errors.Join(err, file.Close())
}

Copy link
Copy Markdown
Author

@fedebram fedebram Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes! better! no nested if else

}
}()

Expand Down
Loading