status-im
/
torrent
mirror of
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bencode: Improve unknown value type error

This commit is contained in:
Matt Joiner 2015-11-03 23:21:10 +11:00
parent 4f03dd3fc7
commit 5f4fdfbd3d
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bencode/decode.go
View File

@ -4,6 +4,7 @@ import (
"bufio"
"bytes"
"errors"
"fmt"
"io"
"math/big"
"reflect"
@ -371,11 +372,7 @@ func (d *decoder) read_one_value() bool {
break
}
// unknown value
panic(&SyntaxError{
Offset: d.offset - 1,
What: errors.New("unknown value type (invalid bencode?)"),
})
d.raiseUnknownValueType(b, d.offset-1)
}
return true
@ -456,16 +453,20 @@ func (d *decoder) parse_value(v reflect.Value) bool {
break
}
// unknown value
panic(&SyntaxError{
Offset: d.offset - 1,
What: errors.New("unknown value type (invalid bencode?)"),
})
d.raiseUnknownValueType(b, d.offset-1)
}
return true
}
// An unknown bencode type character was encountered.
func (d *decoder) raiseUnknownValueType(b byte, offset int64) {
panic(&SyntaxError{
Offset: offset,
What: fmt.Errorf("unknown value type %+q", b),
})
}
func (d *decoder) parse_value_interface() (interface{}, bool) {
b, err := d.ReadByte()
if err != nil {
@ -490,11 +491,8 @@ func (d *decoder) parse_value_interface() (interface{}, bool) {
return d.parse_string_interface(), true
}
// unknown value
panic(&SyntaxError{
Offset: d.offset - 1,
What: errors.New("unknown value type (invalid bencode?)"),
})
d.raiseUnknownValueType(b, d.offset-1)
panic("unreachable")
}
}