Merge pull request #97 from lixin9311/packet_decryption_overlap_fix

Fix the buffer overlap panic when read a udp/packet socket
shadowsocks · Jun 28, 2018 · 26eb243 · 26eb243
2 parents ef4b562 + cc5b55c
commit 26eb243
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/shadowstream/packet.go b/shadowstream/packet.go
@@ -71,6 +71,10 @@ func (c *packetConn) ReadFrom(b []byte) (int, net.Addr, error) {
 	if err != nil {
 		return n, addr, err
 	}
-	b, err = Unpack(b, b[:n], c.Cipher)
+	bb, err := Unpack(b[c.IVSize():], b[:n], c.Cipher)
+	if err != nil {
+		return n, addr, err
+	}
+	copy(b, bb)
 	return len(b), addr, err
 }