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

Clearer object ownership in psyco_conn_curs

Browse Source 
Make sure the object is assigned only to one variable at time, across
obj, curs, rv (we create it on obj, pass it to curs when we know the
type is right, pass it to rv when we know there was no error).
This commit is contained in:
Daniele Varrazzo 2020-02-09 15:26:13 +00:00 committed by Jon Dufresne
parent 280eefd2f4
commit 6bb6f42169
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
psycopg/connection_type.c
View File

@ -60,6 +60,7 @@ psyco_conn_cursor(connectionObject *self, PyObject *args, PyObject *kwargs)
{
PyObject *obj = NULL;
cursorObject *curs = NULL;
PyObject *rv = NULL;
PyObject *name = Py_None;
PyObject *factory = Py_None;
PyObject *withhold = Py_False;
@ -110,12 +111,13 @@ psyco_conn_cursor(connectionObject *self, PyObject *args, PyObject *kwargs)
if (PyObject_IsInstance(obj, (PyObject *)&cursorType) == 0) {
PyErr_SetString(PyExc_TypeError,
"cursor factory must be subclass of psycopg2.extensions.cursor");
Py_DECREF(obj);
obj = NULL;
goto exit;
}
/* pass ownership from obj to curs */
curs = (cursorObject *)obj;
obj = NULL;
if (0 > curs_withhold_set(curs, withhold)) {
goto error;
}
@ -128,26 +130,31 @@ psyco_conn_cursor(connectionObject *self, PyObject *args, PyObject *kwargs)
obj, Py_REFCNT(obj)
);
obj = NULL;
/* pass ownership from curs to rv */
rv = (PyObject *)curs;
curs = NULL;
goto exit;
error:
{
PyObject *error_type, *error_value, *error_traceback;
PyObject *close;
curs = NULL;
PyErr_Fetch(&error_type, &error_value, &error_traceback);
close = PyObject_CallMethod(obj, "close", NULL);
if (close)
Py_DECREF(close);
else
PyErr_WriteUnraisable(obj);
if (curs) {
close = PyObject_CallMethod((PyObject *)curs, "close", NULL);
if (close)
Py_DECREF(close);
else
PyErr_WriteUnraisable((PyObject *)curs);
}
PyErr_Restore(error_type, error_value, error_traceback);
}
exit:
Py_XDECREF(obj);
return (PyObject *)curs;
Py_XDECREF(curs);
return rv;
}