Skip to content

Don't panic when Payload is null. #157

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

Merged
zombiezen merged 1 commit into from
Aug 24, 2020
Merged

Don't panic when Payload is null. #157

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: 5 additions & 0 deletions rpc/rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,6 +1116,11 @@ func (c *Conn) recvCap(d rpccp.CapDescriptor) (_ *capnp.Client, local bool, _ er
//
// The caller must be holding onto c.mu.
func (c *Conn) recvPayload(payload rpccp.Payload) (_ capnp.Ptr, locals uintSet, _ error) {
if !payload.IsValid() {
// null pointer; in this case we can treat the cap table as being empty
// and just return.
return capnp.Ptr{}, nil, nil
}
if payload.Message().CapTable != nil {
// RecvMessage likely violated its invariant.
return capnp.Ptr{}, nil, fail("read payload: capability table already populated")
Expand Down