python: Fix segmentation fault when default returns it's argument.

methane · methane · commit 3aaf5f5a7afb · 2011-01-29T23:22:41.000+09:00
diff --git a/msgpack/_msgpack.pyx b/msgpack/_msgpack.pyx
@@ -118,9 +118,9 @@ cdef class Packer(object):
                 for v in o:
                     ret = self._pack(v, nest_limit-1)
                     if ret != 0: break
-        elif self._default is not None:
+        elif self._default:
             o = self._default(o)
-            ret = self._pack(o, nest_limit)
+            ret = self._pack(o, nest_limit-1)
         else:
             raise TypeError("can't serialize %r" % (o,))
         return ret
diff --git a/test/test_obj.py b/test/test_obj.py
@@ -26,7 +26,7 @@ def test_decode_hook():
     unpacked = unpacks(packed, object_hook=_decode_complex)
     eq_(unpacked[1], 1+2j)
 
-@raises(TypeError)
+@raises(ValueError)
 def test_bad_hook():
     packed = packs([3, 1+2j], default=lambda o: o)
     unpacked = unpacks(packed)
