psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-02-07 21:00:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed refcount of exceptions dicts

Browse Source
This commit is contained in:
Daniele Varrazzo 2012-02-23 19:33:29 +00:00
parent 08fbd86495
commit 1b27820389
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
psycopg/psycopgmodule.c
View File

@ -494,21 +494,22 @@ psyco_errors_init(void)
live in _psycopg */ live in _psycopg */
int i; int i;
PyObject *dict; PyObject *dict = NULL;
PyObject *base; PyObject *base;
PyObject *str; PyObject *str = NULL;
PyObject *descr; PyObject *descr = NULL;
int rv = -1; int rv = -1;
static PyMethodDef psyco_error_reduce_ex_def = static PyMethodDef psyco_error_reduce_ex_def =
{"__reduce_ex__", psyco_error_reduce_ex, METH_VARARGS, "pickle helper"}; {"__reduce_ex__", psyco_error_reduce_ex, METH_VARARGS, "pickle helper"};
for (i=0; exctable[i].name; i++) { for (i=0; exctable[i].name; i++) {
dict = PyDict_New(); if (!(dict = PyDict_New())) { goto exit; }
if (exctable[i].docstr) { if (exctable[i].docstr) {
str = Text_FromUTF8(exctable[i].docstr); if (!(str = Text_FromUTF8(exctable[i].docstr))) { goto exit; }
PyDict_SetItemString(dict, "__doc__", str); if (0 != PyDict_SetItemString(dict, "__doc__", str)) { goto exit; }
Py_CLEAR(str);
} }
if (exctable[i].base == 0) { if (exctable[i].base == 0) {
@ -522,7 +523,11 @@ psyco_errors_init(void)
else else
base = *exctable[i].base; base = *exctable[i].base;
*exctable[i].exc = PyErr_NewException(exctable[i].name, base, dict); if (!(*exctable[i].exc = PyErr_NewException(
exctable[i].name, base, dict))) {
goto exit;
}
Py_CLEAR(dict);
} }
/* Make pgerror, pgcode and cursor default to None on psycopg /* Make pgerror, pgcode and cursor default to None on psycopg
@ -546,12 +551,14 @@ psyco_errors_init(void)
psyco_error_reduce_ex_def.ml_name, descr)) { psyco_error_reduce_ex_def.ml_name, descr)) {
goto exit; goto exit;
} }
Py_DECREF(descr);
#endif #endif
rv = 0; rv = 0;
exit: exit:
Py_XDECREF(descr);
Py_XDECREF(str);
Py_XDECREF(dict);
return rv; return rv;
} }