Stowage/msgpack-python
2
0
Fork 0
mirror of https://github.com/msgpack/msgpack-python.git synced 2025-10-20 12:23:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Unpacker.tell() (#427)

Browse source 
Fixes #426.

Co-authored-by: folz <joachim.folz@dfki.de>
This commit is contained in:
jfolz 2020-06-08 05:14:50 +02:00 • committed by GitHub
parent b04690012d
commit c1b1a23f62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
msgpack/fallback.py
View file

@ -365,18 +365,19 @@ class Unpacker(object):
return self._buffer[self._buff_i :]
def read_bytes(self, n):
ret = self._read(n)
ret = self._read(n, raise_outofdata=False)
self._consume()
return ret
def _read(self, n):
def _read(self, n, raise_outofdata=True):
# (int) -> bytearray
self._reserve(n)
self._reserve(n, raise_outofdata=raise_outofdata)
i = self._buff_i
self._buff_i = i + n
return self._buffer[i : i + n]
ret = self._buffer[i : i + n]
self._buff_i = i + len(ret)
return ret
def _reserve(self, n):
def _reserve(self, n, raise_outofdata=True):
remain_bytes = len(self._buffer) - self._buff_i - n
# Fast path: buffer has n bytes already
@ -404,7 +405,7 @@ class Unpacker(object):
self._buffer += read_data
remain_bytes -= len(read_data)
if len(self._buffer) < n + self._buff_i:
if len(self._buffer) < n + self._buff_i and raise_outofdata:
self._buff_i = 0 # rollback
raise OutOfData