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

Fixed VarInt and VarLong max size

Browse Source 
Before VarInt could have had a size of 7 byte without generating errors (max should be 5).
>= 5 is because we start from 0 and i=5 is already in error.
For example if byte of VarInt are [255 255 255 255 255 255 1], at penultimate iteration, i will be 5 (start at 0) so there aren't errors and at the last the break bypass the sec&0x80 check.
Same for VarLong.
This commit is contained in:
Erik Pellizzon
2020-04-25 18:06:37 +02:00
committed by GitHub
parent b509967247
commit e6ca182ba1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net/packet/types.go
View File

@ -277,10 +277,10 @@ func (v *VarInt) Decode(r DecodeReader) error {
n |= uint32(sec&0x7F) << uint32(7*i) n |= uint32(sec&0x7F) << uint32(7*i)
if sec&0x80 == 0 { if i >= 5 {
break
} else if i > 5 {
return errors.New("VarInt is too big") return errors.New("VarInt is too big")
} else if sec&0x80 == 0 {
break
} }
} }
@ -316,10 +316,10 @@ func (v *VarLong) Decode(r DecodeReader) error {
n |= uint64(sec&0x7F) << uint64(7*i) n |= uint64(sec&0x7F) << uint64(7*i)
if sec&0x80 == 0 { if i >= 10 {
return errors.New("VarLong is too big")
} else if sec&0x80 == 0 {
break break
} else if i > 10 {
return errors.New("VarInt is too big")
} }
} }