simon987/nyaa
1
0
Fork 0
mirror of https://github.com/simon987/nyaa.git synced 2025-12-14 15:49:02 +00:00
Code Issues Projects Releases Wiki Activity

bencode: fix nontermination on empty or malformed input

Browse Source 
read(1) returns b'' on EOF, which wasn't checked for in a couple cases,
which could cause empty/truncated input to enter one of the `while True`
loops without hope of exit. programming is hard.
This commit is contained in:
queue
2017-07-24 20:39:09 -06:00
parent c5ce99c3f3
commit b1d187613a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nyaa/bencode.py
View File

@@ -55,13 +55,15 @@ def _bencode_decode(file_object, decode_keys_as_utf8=True):
return items
kind = file_object.read(1)
if not kind:
raise create_ex('EOF, expecting kind')
if kind == _B_INT: # Integer
int_bytes = b''
while True:
c = file_object.read(1)
if not c:
raise create_ex('Unexpected end while reading an integer')
raise create_ex('EOF, expecting more integer')
elif c == _B_END:
try:
return int(int_bytes.decode('utf8'))
@@ -97,6 +99,8 @@ def _bencode_decode(file_object, decode_keys_as_utf8=True):
# Read string length until a ':'
while True:
c = file_object.read(1)
if not c:
raise create_ex('EOF, expecting more string len')
if c in _DIGITS:
str_len_bytes += c
elif c == b':':