Skip to content
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

Jump to bottom

transport: Fix double release instances of {in,out}goingMsg #583

Merged
merged 3 commits into from
Aug 14, 2024
Merged

transport: Fix double release instances of {in,out}goingMsg #583

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e57c45
transport: Prove double release is occurring
matheusd Aug 13, 2024
6000253
transport: Fix double release of incoming message
matheusd Aug 13, 2024
df83d72
transport: Track outoingMsg release status
matheusd Aug 13, 2024
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
17 changes: 11 additions & 6 deletions rpc/transport/transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ func (s *transport) RecvMessage() (IncomingMessage, error) {
return nil, err
}

return incomingMsg(rmsg), nil
return &incomingMsg{message: rmsg}, nil
}

// Close closes the underlying ReadWriteCloser. It is not safe to call
Expand Down Expand Up @@ -219,6 +219,7 @@ type outgoingMsg struct {

func (o *outgoingMsg) Release() {
if m := o.message.Message(); !o.released && m != nil {
o.released = true
m.Release()
}
}
Expand All @@ -235,14 +236,18 @@ func (o *outgoingMsg) Send() error {
panic("call to Send() after call to Release()")
}

type incomingMsg rpccp.Message
type incomingMsg struct {
message rpccp.Message
released bool
}

func (i incomingMsg) Message() rpccp.Message {
return rpccp.Message(i)
func (i *incomingMsg) Message() rpccp.Message {
return i.message
}

func (i incomingMsg) Release() {
if m := i.Message().Message(); m != nil {
func (i *incomingMsg) Release() {
if m := i.Message().Message(); !i.released && m != nil {
i.released = true
m.Release()
}
}
Loading