ensure cipher memory safety

julienschmidt · julienschmidt · commit afd9edcd262b · 2013-12-07T23:53:58.000+01:00
diff --git a/packets.go b/packets.go
@@ -188,9 +188,13 @@ func (mc *mysqlConn) readInitPacket() ([]byte, error) {
 		//	return
 		//}
 		//return errMalformPkt
+		return cipher, nil
 	}
 
-	return cipher, nil
+	// make a memory safe copy of the cipher slice
+	var b [8]byte
+	copy(b[:], cipher)
+	return b[:], nil
 }
 
 // Client Authentication Packet

Original file line number	Diff line number	Diff line change
`@@ -188,9 +188,13 @@ func (mc *mysqlConn) readInitPacket() ([]byte, error) {`
`188`	`188`	`// return`
`189`	`189`	`//}`
`190`	`190`	`//return errMalformPkt`
	`191`	`+ return cipher, nil`
`191`	`192`	`}`
`192`	`193`
`193`		`- return cipher, nil`
	`194`	`+ // make a memory safe copy of the cipher slice`
	`195`	`+ var b [8]byte`
	`196`	`+ copy(b[:], cipher)`
	`197`	`+ return b[:], nil`
`194`	`198`	`}`
`195`	`199`
`196`	`200`	`// Client Authentication Packet`