recycle read pool immediately to avoid panic (#133)

XiaoMi · Nov 20, 2020 · 2d3303c · 2d3303c
1 parent ee11efb
commit 2d3303c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/mysql/conn.go b/mysql/conn.go
@@ -264,15 +264,14 @@ func (c *Conn) ReadEphemeralPacketDirect() ([]byte, error) {
 	if c.currentEphemeralPolicy != ephemeralUnused {
 		panic(fmt.Errorf("ReadEphemeralPacketDirect: unexpected currentEphemeralPolicy: %v", c.currentEphemeralPolicy))
 	}
+	c.currentEphemeralPolicy = ephemeralRead
 
 	var r io.Reader = c.conn
-
 	length, err := c.readHeaderFrom(r)
 	if err != nil {
 		return nil, err
 	}
 
-	c.currentEphemeralPolicy = ephemeralRead
 	if length == 0 {
 		// This can be caused by the packet after a packet of
 		// exactly size MaxPacketSize.

diff --git a/proxy/server/client_conn.go b/proxy/server/client_conn.go
@@ -131,10 +131,10 @@ func (cc *ClientConn) readHandshakeResponse() (HandshakeResponseInfo, error) {
 	info.Salt = cc.salt
 
 	data, err := cc.ReadEphemeralPacketDirect()
+	defer cc.RecycleReadPacket()
 	if err != nil {
 		return info, err
 	}
-	defer cc.RecycleReadPacket()
 
 	pos := 0