dlss
/
FedP2P
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bencode: Fix decoding integer with leading +

This commit is contained in:
Matt Joiner 2021-12-10 14:29:35 +11:00
parent 8764456d23
commit 79511abe6c
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bencode/decode.go
View File

@ -105,7 +105,7 @@ func (d *Decoder) throwSyntaxError(offset int64, err error) {
func (d *Decoder) readInt() error {
// start := d.Offset - 1
d.readUntil('e')
if err := d.bufLeadingZero(); err != nil {
if err := d.checkBufferedInt(); err != nil {
return err
}
// if d.buf.Len() == 0 {
@ -161,10 +161,16 @@ func (d *Decoder) parseInt(v reflect.Value) error {
return nil
}
func (d *Decoder) bufLeadingZero() error {
func (d *Decoder) checkBufferedInt() error {
b := d.buf.Bytes()
if len(b) > 1 && b[0] == '0' {
return fmt.Errorf("non-zero integer has leading zeroes: %q", b)
if len(b) <= 1 {
return nil
}
if b[0] == '-' {
b = b[1:]
}
if b[0] < '1' || b[0] > '9' {
return errors.New("invalid leading digit")
}
return nil
}
@ -173,7 +179,7 @@ func (d *Decoder) parseStringLength() (uint64, error) {
// We should have already consumed the first byte of the length into the Decoder buf.
start := d.Offset - 1
d.readUntil(':')
if err := d.bufLeadingZero(); err != nil {
if err := d.checkBufferedInt(); err != nil {
return 0, err
}
length, err := strconv.ParseUint(bytesAsString(d.buf.Bytes()), 10, 32)

2
bencode/testdata/fuzz/FuzzInterfaceRoundTrip/321f4f280d23ac90ccaf7894a9106ad601e23fd484747898394a12bddba90615 vendored Normal file
View File

@ -0,0 +1,2 @@
go test fuzz v1
[]byte("i+0e")

2
bencode/testdata/fuzz/FuzzInterfaceRoundTrip/808391fc9a93d89909205a5216675a7e1b7b8ef7b4e4d80ec7b7b5dce6dbbb38 vendored Normal file
View File

@ -0,0 +1,2 @@
go test fuzz v1
[]byte("i-0e")