From 0db5e0439dab0445d9f84aa5f6fbf2f535cd8d0d Mon Sep 17 00:00:00 2001
From: inada-n <omoikane@users.sourceforge.jp>
Date: Mon, 13 Jul 2009 15:49:38 +0900
Subject: [PATCH] Fix: Unpacker.unpack() may raise StopIteration before
 unpacking large object when deserializing from file.

---
 python/msgpack/_msgpack.pyx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/python/msgpack/_msgpack.pyx b/python/msgpack/_msgpack.pyx
index 7990a182..cb951463 100644
--- a/python/msgpack/_msgpack.pyx
+++ b/python/msgpack/_msgpack.pyx
@@ -265,7 +265,11 @@ cdef class Unpacker(object):
         cdef Py_ssize_t add_size
 
         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:
             return
@@ -307,6 +311,8 @@ cdef class Unpacker(object):
         if ret == 1:
             return template_data(&self.ctx)
         elif ret == 0:
+            if self.file_like is not None:
+                return self.unpack()
             raise StopIteration, "No more unpack data."
         else:
             raise ValueError, "Unpack failed."