From be35df38184fe2446f3ed23a286aa207359adeb9 Mon Sep 17 00:00:00 2001
From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Sun, 4 Mar 2012 04:41:36 +0000
Subject: [PATCH] Fixed typecasters refcount

---
 psycopg/typecast.c | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/psycopg/typecast.c b/psycopg/typecast.c
index e4abd8f7..9c36b02b 100644
--- a/psycopg/typecast.c
+++ b/psycopg/typecast.c
@@ -254,30 +254,24 @@ RAISES_NEG int
 typecast_init(PyObject *dict)
 {
     int i;
+    int rv = -1;
+    typecastObject *t = NULL;
 
     /* create type dictionary and put it in module namespace */
-    psyco_types = PyDict_New();
-    psyco_binary_types = PyDict_New();
-
-    if (!psyco_types || !psyco_binary_types) {
-        Py_XDECREF(psyco_types);
-        Py_XDECREF(psyco_binary_types);
-        return -1;
-    }
-
+    if (!(psyco_types = PyDict_New())) { goto exit; }
     PyDict_SetItemString(dict, "string_types", psyco_types);
+
+    if (!(psyco_binary_types = PyDict_New())) { goto exit; }
     PyDict_SetItemString(dict, "binary_types", psyco_binary_types);
 
     /* insert the cast types into the 'types' dictionary and register them in
        the module dictionary */
     for (i = 0; typecast_builtins[i].name != NULL; i++) {
-        typecastObject *t;
-
         Dprintf("typecast_init: initializing %s", typecast_builtins[i].name);
 
         t = (typecastObject *)typecast_from_c(&(typecast_builtins[i]), dict);
-        if (t == NULL) return -1;
-        if (typecast_add((PyObject *)t, NULL, 0) != 0) return -1;
+        if (t == NULL) { goto exit; }
+        if (typecast_add((PyObject *)t, NULL, 0) < 0) { goto exit; }
 
         PyDict_SetItem(dict, t->name, (PyObject *)t);
 
@@ -285,6 +279,8 @@ typecast_init(PyObject *dict)
         if (typecast_builtins[i].values == typecast_BINARY_types) {
             psyco_default_binary_cast = (PyObject *)t;
         }
+        Py_DECREF((PyObject *)t);
+        t = NULL;
     }
 
     /* create and save a default cast object (but does not register it) */
@@ -294,25 +290,31 @@ typecast_init(PyObject *dict)
 #ifdef HAVE_MXDATETIME
     if (0 == psyco_typecast_mxdatetime_init()) {
         for (i = 0; typecast_mxdatetime[i].name != NULL; i++) {
-            typecastObject *t;
             Dprintf("typecast_init: initializing %s", typecast_mxdatetime[i].name);
             t = (typecastObject *)typecast_from_c(&(typecast_mxdatetime[i]), dict);
-            if (t == NULL) return -1;
+            if (t == NULL) { goto exit; }
             PyDict_SetItem(dict, t->name, (PyObject *)t);
+            Py_DECREF((PyObject *)t);
+            t = NULL;
         }
     }
 #endif
 
-    if (psyco_typecast_datetime_init()) { return -1; }
+    if (0 > psyco_typecast_datetime_init()) { goto exit; }
     for (i = 0; typecast_pydatetime[i].name != NULL; i++) {
-        typecastObject *t;
         Dprintf("typecast_init: initializing %s", typecast_pydatetime[i].name);
         t = (typecastObject *)typecast_from_c(&(typecast_pydatetime[i]), dict);
-        if (t == NULL) return -1;
+        if (t == NULL) { goto exit; }
         PyDict_SetItem(dict, t->name, (PyObject *)t);
+        Py_DECREF((PyObject *)t);
+        t = NULL;
     }
 
-    return 0;
+    rv = 0;
+
+exit:
+    Py_XDECREF((PyObject *)t);
+    return rv;
 }
 
 /* typecast_add - add a type object to the dictionary */