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

Fixed memory leak with large objects

Browse Source 
Deallocating closed large objects failed to decrement the connection
refcount. The fact the lobject is closed doesn't matter for refcount.
Issue detected by the always useful scripts/refcounter.py

With an extra bit of unrequested whitespace love.
This commit is contained in:
Daniele Varrazzo 2014-08-26 02:27:51 +01:00
parent 3dad8344c0
commit 8cf30509ad
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -17,6 +17,7 @@ What's new in psycopg 2.5.4
PostgreSQL but not documented. PostgreSQL but not documented.
- Make sure the internal `_psycopg.so` module can be imported stand-alone - Make sure the internal `_psycopg.so` module can be imported stand-alone
(to allow modules juggling such as the one described in :ticket:`#201`). (to allow modules juggling such as the one described in :ticket:`#201`).
- Fixed memory leak with large objects (regression introduced in 2.5.3).
What's new in psycopg 2.5.3 What's new in psycopg 2.5.3

5
psycopg/lobject_type.c
View File

@ -333,11 +333,10 @@ lobject_setup(lobjectObject *self, connectionObject *conn,
return -1; return -1;
} }
Py_INCREF((PyObject*)conn);
self->conn = conn; self->conn = conn;
self->mark = conn->mark; self->mark = conn->mark;
Py_INCREF((PyObject*)self->conn);
self->fd = -1; self->fd = -1;
self->oid = InvalidOid; self->oid = InvalidOid;
@ -358,8 +357,8 @@ lobject_dealloc(PyObject* obj)
if (self->conn && self->fd != -1) { if (self->conn && self->fd != -1) {
if (lobject_close(self) < 0) if (lobject_close(self) < 0)
PyErr_Print(); PyErr_Print();
Py_XDECREF((PyObject*)self->conn);
} }
Py_CLEAR(self->conn);
PyMem_Free(self->smode); PyMem_Free(self->smode);
Dprintf("lobject_dealloc: deleted lobject object at %p, refcnt = " Dprintf("lobject_dealloc: deleted lobject object at %p, refcnt = "