falloutBot/go-mc
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add unpack packet check to prevent panic

Browse Source
This commit is contained in:
Tnze
2022-05-28 14:23:00 +08:00
parent 33f604aa93
commit 0c9ea959a7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/packet/packet.go
View File

@ -8,6 +8,8 @@ import (
"sync" "sync"
) )
const MaxDataLength = 2097152
// Packet define a net data package // Packet define a net data package
type Packet struct { type Packet struct {
ID int32 ID int32
@ -170,6 +172,9 @@ func (p *Packet) unpackWithoutCompression(r io.Reader) error {
p.ID = int32(PacketID) p.ID = int32(PacketID)
lengthOfData := int(Length) - int(n) lengthOfData := int(Length) - int(n)
if lengthOfData < 0 || lengthOfData > MaxDataLength {
return fmt.Errorf("uncompressed packet error: lenght is %d", lengthOfData)
}
if cap(p.Data) < lengthOfData { if cap(p.Data) < lengthOfData {
p.Data = make([]byte, lengthOfData) p.Data = make([]byte, lengthOfData)
} else { } else {
@ -210,7 +215,6 @@ func (p *Packet) unpackWithCompression(r io.Reader, threshold int) error {
if int(DataLength) < threshold { if int(DataLength) < threshold {
return fmt.Errorf("compressed packet error: size of %d is below threshold of %d", DataLength, threshold) return fmt.Errorf("compressed packet error: size of %d is below threshold of %d", DataLength, threshold)
} }
const MaxDataLength = 2097152
if DataLength > MaxDataLength { if DataLength > MaxDataLength {
return fmt.Errorf("compressed packet error: size of %d is larger than protocol maximum of %d", DataLength, MaxDataLength) return fmt.Errorf("compressed packet error: size of %d is larger than protocol maximum of %d", DataLength, MaxDataLength)
} }