generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-19 21:18:23 +01:00
Code Issues Projects Releases Wiki Activity

Fix: Unpacker.unpack() may raise StopIteration before unpacking large object when deserializing from file.

Browse Source
This commit is contained in:
inada-n 2009-07-13 15:49:38 +09:00
parent 6083bad5ff
commit 0db5e0439d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/msgpack/_msgpack.pyx
View File

@ -265,7 +265,11 @@ cdef class Unpacker(object):
cdef Py_ssize_t add_size cdef Py_ssize_t add_size
if self.file_like is not None: if self.file_like is not None:
self.waiting_bytes.append(self.file_like.read(self.read_size)) next_bytes = self.file_like.read(self.read_size)
if next_bytes:
self.waiting_bytes.append(next_bytes)
else:
self.file_like = None
if not self.waiting_bytes: if not self.waiting_bytes:
return return
@ -307,6 +311,8 @@ cdef class Unpacker(object):
if ret == 1: if ret == 1:
return template_data(&self.ctx) return template_data(&self.ctx)
elif ret == 0: elif ret == 0:
if self.file_like is not None:
return self.unpack()
raise StopIteration, "No more unpack data." raise StopIteration, "No more unpack data."
else: else:
raise ValueError, "Unpack failed." raise ValueError, "Unpack failed."