Fix unpacker doesn't raise exception for invalid input (Merge branch '0.2'

Fixes #40

Conflicts:
	ChangeLog.rst
	msgpack/_unpacker.pyx
	msgpack/_version.py

2 files changed, 9 insertions, 1 deletions

diff --git a/msgpack/_unpacker.pyx b/msgpack/_unpacker.pyx
index 4a27d9e..b83a6e4 100644
--- a/msgpack/_unpacker.pyx
+++ b/msgpack/_unpacker.pyx
@@ -38,7 +38,7 @@ cdef extern from "unpack.h":
         PyObject* key
 
     ctypedef int (*execute_fn)(template_context* ctx, const_char_ptr data,
-                               size_t len, size_t* off) except -1
+                               size_t len, size_t* off) except? -1
     execute_fn template_construct
     execute_fn template_skip
     execute_fn read_array_header
@@ -113,6 +113,8 @@ def unpackb(object packed, object object_hook=None, object list_hook=None,
         if off < buf_len:
             raise ExtraData(obj, PyBytes_FromStringAndSize(buf+off, buf_len-off))
         return obj
+    elif ret < 0:
+        raise ValueError("Unpack failed: error = %d" % (ret,))
     else:
         raise UnpackValueError
 
diff --git a/test/test_except.py b/test/test_except.py
index e142dd6..35287df 100644
--- a/test/test_except.py
+++ b/test/test_except.py
@@ -6,6 +6,7 @@ from msgpack import packb, unpackb
 
 import datetime
 
+
 class DummyException(Exception):
     pass
 
@@ -28,6 +29,11 @@ def test_raise_from_object_hook():
                   object_pairs_hook=hook)
 
 
+@raises(ValueError)
+def test_invalidvalue():
+    unpackb(b'\xd9\x97#DL_')
+
+
 if __name__ == '__main__':
     from nose import main
     main()