Merge pull request #269 from capnproto/bugfix/question-release-panic

Defend against nil-pointer panics in question.release
capnproto · Jul 29, 2022 · 4e56003 · 4e56003
2 parents 13980e3 + 94705f5
commit 4e56003
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/rpc/question.go b/rpc/question.go
@@ -49,6 +49,7 @@ func (c *Conn) newQuestion(method capnp.Method) *question {
  q := &question{
  c: c,
  id: questionID(c.questionID.next()),
+ release: func() {},
  finishMsgSend: make(chan struct{}),
  }
  q.p = capnp.NewPromise(method, q) // TODO(someday): customize error message for bootstrap

diff --git a/rpc/rpc.go b/rpc/rpc.go
@@ -947,7 +947,6 @@ func (c *Conn) handleReturn(ctx context.Context, ret rpccp.Return, release capnp
  go func() {
  switch {
  case q.bootstrapPromise != nil && pr.err == nil:
- q.release = func() {}
  syncutil.Without(&c.mu, func() {
  q.p.Fulfill(pr.result)
  q.bootstrapPromise.Fulfill(q.p.Answer().Client())
@@ -958,7 +957,6 @@ func (c *Conn) handleReturn(ctx context.Context, ret rpccp.Return, release capnp
  case q.bootstrapPromise != nil && pr.err != nil:
  // TODO(someday): send unimplemented message back to remote if
  // pr.unimplemented == true.
- q.release = func() {}
  syncutil.Without(&c.mu, func() {
  q.p.Reject(pr.err)
  q.bootstrapPromise.Fulfill(q.p.Answer().Client())
@@ -968,7 +966,6 @@ func (c *Conn) handleReturn(ctx context.Context, ret rpccp.Return, release capnp
  case q.bootstrapPromise == nil && pr.err != nil:
  // TODO(someday): send unimplemented message back to remote if
  // pr.unimplemented == true.
- q.release = func() {}
  syncutil.Without(&c.mu, func() {
  q.p.Reject(pr.err)
  release()