Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions bencoder.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ class BTFailure(Exception):
def decode_int(bytes x, int f):
f += 1
cdef long new_f = x.index(b'e', f)
digits = x[f + 1:new_f] if x[f] == b'-'[0] else x[f:new_f]
if not digits.isdigit():
# int() would also accept '+', '_' and whitespace
raise ValueError()
n = int(x[f:new_f])
if x[f] == b'-'[0]:
if x[f + 1] == b'0'[0]:
Expand All @@ -35,6 +39,8 @@ def decode_int(bytes x, int f):

def decode_string(bytes x, int f):
cdef long colon = x.index(b':', f)
if not x[f:colon].isdigit():
raise ValueError()
cdef long n = int(x[f:colon])
if x[f] == b'0'[0] and colon != f + 1:
raise ValueError()
Expand Down
13 changes: 13 additions & 0 deletions tests/test_decode.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,19 @@ def test_decode_large_int():
assert bdecode(BENCODED_MAXSIZE) == MAX_SIZE


def test_decode_rejects_non_canonical_numbers():
import pytest
from bencoder import BTFailure

for data in (b'i1_0e', b'i+1e', b'i 1e', b'i1 e', b'i-+1e', b'ie', b'i-e',
b'1_0:aaaaaaaaaa', b'1 :a', b'li1_0ee', b'd1:ai1_0ee'):
with pytest.raises(BTFailure):
bdecode(data)
assert bdecode(b'i-10e') == -10
assert bdecode(b'i0e') == 0
assert bdecode(b'10:aaaaaaaaaa') == b'aaaaaaaaaa'


def test_decode_list():
assert bdecode(b'l1:a1:bi3ee') == [b'a', b'b', 3]

Expand Down