Merge pull request #22448 from andreimatei/fix-acc-leak

pgwire: fix memory account leak
cockroachdb · Feb 7, 2018 · 0c577f2 · 0c577f2
2 parents fd167ce + f86d95e
commit 0c577f2
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pkg/sql/pgwire/v3.go b/pkg/sql/pgwire/v3.go
@@ -337,10 +337,12 @@ func (c *v3Conn) serve(ctx context.Context, draining func() bool, reserved mon.B
 		c.writeBuf.writeTerminatedString(key)
 		c.writeBuf.writeTerminatedString(value)
 		if err := c.writeBuf.finishMsg(c.wr); err != nil {
+			reserved.Close(ctx)
 			return err
 		}
 	}
 	if err := c.wr.Flush(); err != nil {
+		reserved.Close(ctx)
 		return err
 	}