From f86d95e9ea5abf1ee9b0ef9d8006183fa265869e Mon Sep 17 00:00:00 2001
From: Andrei Matei <andrei@cockroachlabs.com>
Date: Tue, 6 Feb 2018 20:03:55 -0500
Subject: [PATCH] pgwire: fix memory account leak

Want unique_ptr.

Release note: None
---
 pkg/sql/pgwire/v3.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/sql/pgwire/v3.go b/pkg/sql/pgwire/v3.go
index 1128c62090aa..99e5aa4b9b30 100644
--- 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
 	}