strip null termination from authData

bdollma-te · methane · web-flow · commit e5d765e2892c · 2025-01-28T14:25:52.000+02:00
Only if authData is provided and indeed is null terminated, then strip it.

Co-authored-by: Inada Naoki &lt;songofacandy@gmail.com&gt;
diff --git a/packets.go b/packets.go
@@ -509,11 +509,9 @@ func (mc *mysqlConn) readAuthResult() ([]byte, string, error) {
 			return nil, "", ErrMalformPkt
 		}
 		plugin := string(data[1:pluginEndIndex])
-		var authData []byte
-		if pluginEndIndex == len(data)-1 {
-			authData = data[pluginEndIndex+1:]
-		} else {
-			authData = data[pluginEndIndex+1 : len(data)-1]
+		authData := data[pluginEndIndex+1:]
+		if len(authData) > 0 && authData[len(authData)-1] == 0 {
+			authData = authData[:len(authData)-1]
 		}
 		return authData, plugin, nil
 

Original file line number	Diff line number	Diff line change
`@@ -509,11 +509,9 @@ func (mc *mysqlConn) readAuthResult() ([]byte, string, error) {`
`509`	`509`	`return nil, "", ErrMalformPkt`
`510`	`510`	`}`
`511`	`511`	`plugin := string(data[1:pluginEndIndex])`
`512`		`- var authData []byte`
`513`		`- if pluginEndIndex == len(data)-1 {`
`514`		`- authData = data[pluginEndIndex+1:]`
`515`		`- } else {`
`516`		`- authData = data[pluginEndIndex+1 : len(data)-1]`
	`512`	`+ authData := data[pluginEndIndex+1:]`
	`513`	`+ if len(authData) > 0 && authData[len(authData)-1] == 0 {`
	`514`	`+ authData = authData[:len(authData)-1]`
`517`	`515`	`}`
`518`	`516`	`return authData, plugin, nil`
`519`	`517`