psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-23 01:16:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed leak of cancel key on connection.reset()

Browse Source 
Moving the final free into the destructor is not necessary but looks
appropriate.
This commit is contained in:
Daniele Varrazzo 2013-03-20 15:54:42 +00:00
parent 9813bac4fe
commit 3410fee8d1
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
psycopg/connection.h
View File

@ -134,7 +134,6 @@ HIDDEN int conn_get_standard_conforming_strings(PGconn *pgconn);
RAISES_NEG HIDDEN int conn_get_isolation_level(connectionObject *self); RAISES_NEG HIDDEN int conn_get_isolation_level(connectionObject *self);
HIDDEN int conn_get_protocol_version(PGconn *pgconn); HIDDEN int conn_get_protocol_version(PGconn *pgconn);
HIDDEN int conn_get_server_version(PGconn *pgconn); HIDDEN int conn_get_server_version(PGconn *pgconn);
HIDDEN PGcancel *conn_get_cancel(PGconn *pgconn);
HIDDEN void conn_notice_process(connectionObject *self); HIDDEN void conn_notice_process(connectionObject *self);
HIDDEN void conn_notice_clean(connectionObject *self); HIDDEN void conn_notice_clean(connectionObject *self);
HIDDEN void conn_notifies_process(connectionObject *self); HIDDEN void conn_notifies_process(connectionObject *self);

32
psycopg/connection_int.c
View File

@ -439,10 +439,22 @@ conn_get_server_version(PGconn *pgconn)
return (int)PQserverVersion(pgconn); return (int)PQserverVersion(pgconn);
} }
PGcancel * /* set up the cancel key of the connection.
conn_get_cancel(PGconn *pgconn) * On success return 0, else set an exception and return -1
*/
RAISES_NEG static int
conn_setup_cancel(connectionObject *self, PGconn *pgconn)
{ {
return PQgetCancel(pgconn); if (self->cancel) {
PQfreeCancel(self->cancel);
}
if (!(self->cancel = PQgetCancel(self->pgconn))) {
PyErr_SetString(OperationalError, "can't get cancellation key");
return -1;
}
return 0;
} }
@ -486,9 +498,7 @@ conn_setup(connectionObject *self, PGconn *pgconn)
return -1; return -1;
} }
self->cancel = conn_get_cancel(self->pgconn); if (0 > conn_setup_cancel(self, pgconn)) {
if (self->cancel == NULL) {
PyErr_SetString(OperationalError, "can't get cancellation key");
return -1; return -1;
} }
@ -788,10 +798,8 @@ _conn_poll_setup_async(connectionObject *self)
if (0 > conn_read_encoding(self, self->pgconn)) { if (0 > conn_read_encoding(self, self->pgconn)) {
break; break;
} }
self->cancel = conn_get_cancel(self->pgconn); if (0 > conn_setup_cancel(self, self->pgconn)) {
if (self->cancel == NULL) { return -1;
PyErr_SetString(OperationalError, "can't get cancellation key");
break;
} }
/* asynchronous connections always use isolation level 0, the user is /* asynchronous connections always use isolation level 0, the user is
@ -959,10 +967,6 @@ void conn_close_locked(connectionObject *self)
self->pgconn = NULL; self->pgconn = NULL;
Dprintf("conn_close: PQfinish called"); Dprintf("conn_close: PQfinish called");
} }
if (self->cancel) {
PQfreeCancel(self->cancel);
self->cancel = NULL;
}
} }
/* conn_commit - commit on a connection */ /* conn_commit - commit on a connection */

1
psycopg/connection_type.c
View File

@ -1135,6 +1135,7 @@ connection_dealloc(PyObject* obj)
PyMem_Free(self->encoding); PyMem_Free(self->encoding);
PyMem_Free(self->codec); PyMem_Free(self->codec);
if (self->critical) free(self->critical); if (self->critical) free(self->critical);
if (self->cancel) PQfreeCancel(self->cancel);
Py_CLEAR(self->tpc_xid); Py_CLEAR(self->tpc_xid);
Py_CLEAR(self->async_cursor); Py_CLEAR(self->async_cursor);