Skip to content

bump with bdecode2, which does not error on extra bytes #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2017
Merged

bump with bdecode2, which does not error on extra bytes #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions bencoder.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,19 @@ for func, keys in [
decode_func[ord(key)] = func


def bdecode(bytes x):
def bdecode2(bytes x):
try:
r, l = decode_func[x[0]](x, 0)
except (IndexError, KeyError, ValueError):
raise BTFailure("not a valid bencoded string")
return r, l

def bdecode(bytes x):
r, l = bdecode2(x)
if l != len(x):
raise BTFailure("invalid bencoded value (data after valid prefix)")
return r


def encode(v, r):
tp = type(v)
if tp in encode_func:
Expand Down