From 5d4189306ae0b6ea23e9410d34434b41aee384b3 Mon Sep 17 00:00:00 2001
From: Naoki INADA <inada-n@eagle>
Date: Wed, 24 Jun 2009 04:25:05 +0900
Subject: [PATCH] Check return value of c-api.

---
 python/msgpack/unpack.h | 124 ++++++++++++++++++++++++++++++----------
 1 file changed, 95 insertions(+), 29 deletions(-)

diff --git a/python/msgpack/unpack.h b/python/msgpack/unpack.h
index 12afb998..e30b72a7 100644
--- a/python/msgpack/unpack.h
+++ b/python/msgpack/unpack.h
@@ -59,42 +59,84 @@ static inline msgpack_unpack_object template_callback_root(unpack_user* u)
     return NULL;
 }
 
-static inline int template_callback_uint8(unpack_user* u, uint8_t d, msgpack_unpack_object* o)
-{ *o = PyInt_FromLong((long)d); return 0; }
-
 static inline int template_callback_uint16(unpack_user* u, uint16_t d, msgpack_unpack_object* o)
-{ *o = PyInt_FromLong((long)d); return 0; }
+{
+    PyObject *p = PyInt_FromLong((long)d);
+    if (!p)
+        return -1;
+    *o = p;
+    return 0;
+}
+static inline int template_callback_uint8(unpack_user* u, uint8_t d, msgpack_unpack_object* o)
+{
+    return template_callback_uint16(u, d, o);
+}
+
 
 static inline int template_callback_uint32(unpack_user* u, uint32_t d, msgpack_unpack_object* o)
 {
+    PyObject *p;
     if (d > LONG_MAX) {
-        *o = PyLong_FromUnsignedLong((unsigned long)d);
+        p = PyLong_FromUnsignedLong((unsigned long)d);
     } else {
-        *o = PyInt_FromLong((long)d);
+        p = PyInt_FromLong((long)d);
     }
+    if (!p)
+        return -1;
+    *o = p;
     return 0;
 }
 
 static inline int template_callback_uint64(unpack_user* u, uint64_t d, msgpack_unpack_object* o)
-{ *o = PyLong_FromUnsignedLongLong(d); return 0; }
-
-static inline int template_callback_int8(unpack_user* u, int8_t d, msgpack_unpack_object* o)
-{ *o = PyInt_FromLong(d); return 0; }
-
-static inline int template_callback_int16(unpack_user* u, int16_t d, msgpack_unpack_object* o)
-{ *o = PyInt_FromLong(d); return 0; }
+{
+    PyObject *p = PyLong_FromUnsignedLongLong(d);
+    if (!p)
+        return -1;
+    *o = p;
+    return 0;
+}
 
 static inline int template_callback_int32(unpack_user* u, int32_t d, msgpack_unpack_object* o)
-{ *o = PyInt_FromLong(d); return 0; }
+{
+    PyObject *p = PyInt_FromLong(d);
+    if (!p)
+        return -1;
+    *o = p;
+    return 0;
+}
+
+static inline int template_callback_int16(unpack_user* u, int16_t d, msgpack_unpack_object* o)
+{
+    return template_callback_int32(u, d, o);
+}
+
+static inline int template_callback_int8(unpack_user* u, int8_t d, msgpack_unpack_object* o)
+{
+    return template_callback_int32(u, d, o);
+}
 
 static inline int template_callback_int64(unpack_user* u, int64_t d, msgpack_unpack_object* o)
-{ *o = PyLong_FromLongLong(d); return 0; }
-
-static inline int template_callback_float(unpack_user* u, float d, msgpack_unpack_object* o)
-{ *o = PyFloat_FromDouble((double)d); return 0; }
+{
+    PyObject *p = PyLong_FromLongLong(d);
+    if (!p)
+        return -1;
+    *o = p;
+    return 0;
+}
 
 static inline int template_callback_double(unpack_user* u, double d, msgpack_unpack_object* o)
-{ *o = PyFloat_FromDouble(d); return 0; }
+{
+    PyObject *p = PyFloat_FromDouble(d);
+    if (!p)
+        return -1;
+    *o = p;
+    return 0;
+}
+
+static inline int template_callback_float(unpack_user* u, float d, msgpack_unpack_object* o)
+{
+    return template_callback_double(u, d, o);
+}
 
 static inline int template_callback_nil(unpack_user* u, msgpack_unpack_object* o)
 { Py_INCREF(Py_None); *o = Py_None; return 0; }
@@ -106,40 +148,64 @@ static inline int template_callback_false(unpack_user* u, msgpack_unpack_object*
 { Py_INCREF(Py_False); *o = Py_False; return 0; }
 
 static inline int template_callback_array(unpack_user* u, unsigned int n, msgpack_unpack_object* o)
-{ *o = PyList_New(n); return 0; }
+{
+    PyObject *p = PyList_New(n);
+    if (!p)
+        return -1;
+    *o = p;
+    return 0;
+}
 
 static inline int template_callback_array_item(unpack_user* u, unsigned int current, msgpack_unpack_object* c, msgpack_unpack_object o)
 { PyList_SET_ITEM(*c, current, o); return 0; }
 
 static inline int template_callback_map(unpack_user* u, unsigned int n, msgpack_unpack_object* o)
-{ *o = PyDict_New(); return 0; }
+{
+    PyObject *p = PyDict_New();
+    if (!p)
+        return -1;
+    *o = p;
+    return 0;
+}
 
 static inline int template_callback_map_item(unpack_user* u, msgpack_unpack_object* c, msgpack_unpack_object k, msgpack_unpack_object v)
 {
-    PyDict_SetItem(*c, k, v);
-    Py_DECREF(k);
-    Py_DECREF(v);
-    return 0;
+    if (PyDict_SetItem(*c, k, v) == 0) {
+        Py_DECREF(k);
+        Py_DECREF(v);
+        return 0;
+    }
+    return -1;
 }
 
 static inline int template_callback_raw(unpack_user* u, const char* b, const char* p, unsigned int l, msgpack_unpack_object* o)
 {
+    PyObject *py;
     if (l < 16) {
         std::string s(p, l);
         str_cach_t ::iterator it = u->strcache.find(s);
         if (it != u->strcache.end()) {
             *o = it->second;
+            Py_INCREF(*o);
+            return 0;
         }
         else {
-            *o = PyString_FromStringAndSize(p, l);
+            py = PyString_FromStringAndSize(p, l);
+            if (!py)
+                return -1;
+            *o = py;
+            Py_INCREF(*o);
             u->strcache[s] = *o;
+            return 0;
         }
-        Py_INCREF(*o);
     }
     else {
-        *o = PyString_FromStringAndSize(p, l);
+        py = PyString_FromStringAndSize(p, l);
+        if (!py)
+            return -1;
+        *o = py;
+        return 0;
     }
-    return 0;
 }
 
 #include "unpack_template.h"