Commit 34eafb78 authored by scoder's avatar scoder Committed by GitHub

Reimplement __Pyx_PyDict_GetItemStrWithError() for Py2 to fix a memory leak (GH-3593)

Reimplement __Pyx_PyDict_GetItemStrWithError() as a hacky version in Py2 to get the semantics right of returning a borrowed reference with non-KeyError exceptions left in place.

Closes https://github.com/cython/cython/issues/3578
parent ac694af1
...@@ -25,6 +25,10 @@ Bugs fixed ...@@ -25,6 +25,10 @@ Bugs fixed
could fail to acquire the GIL in some cases on function exit. could fail to acquire the GIL in some cases on function exit.
(Github issue #3590 etc.) (Github issue #3590 etc.)
* A reference leak when processing keyword arguments in Py2 was resolved,
that appeared in 3.0a1.
(Github issue #3578)
* The outdated getbuffer/releasebuffer implementations in the NumPy * The outdated getbuffer/releasebuffer implementations in the NumPy
declarations were removed so that buffers declared as ``ndarray`` declarations were removed so that buffers declared as ``ndarray``
now use the normal implementation in NumPy. now use the normal implementation in NumPy.
......
...@@ -676,10 +676,28 @@ static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStr(PyObject *dict, PyObject ...@@ -676,10 +676,28 @@ static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStr(PyObject *dict, PyObject
#define __Pyx_PyDict_GetItemStr PyDict_GetItem #define __Pyx_PyDict_GetItemStr PyDict_GetItem
#else #else
static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStrWithError(PyObject *dict, PyObject *name) { static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStrWithError(PyObject *dict, PyObject *name) {
PyObject *res = PyObject_GetItem(dict, name); // This is tricky - we should return a borrowed reference but not swallow non-KeyError exceptions. 8-|
if (res == NULL && PyErr_ExceptionMatches(PyExc_KeyError)) // But: this function is only used in Py2 and older PyPys,
PyErr_Clear(); // and currently only for argument parsing and other non-correctness-critical lookups
return res; // and we know that 'name' is an interned 'str' with pre-calculated hash value (only comparisons can fail),
// thus, performance matters more than correctness here, especially in the "not found" case.
#if CYTHON_COMPILING_IN_PYPY
// So we ignore any exceptions in old PyPys ...
return PyDict_GetItem(dict, name);
#else
// and hack together a stripped-down and modified PyDict_GetItem() in CPython 2.
PyDictEntry *ep;
PyDictObject *mp = (PyDictObject*) dict;
long hash = ((PyStringObject *) name)->ob_shash;
assert(hash != -1); /* hash values of interned strings are always initialised */
ep = (mp->ma_lookup)(mp, name, hash);
if (ep == NULL) {
// error occurred
return NULL;
}
// found or not found
return ep->me_value;
#endif
} }
#define __Pyx_PyDict_GetItemStr PyDict_GetItem #define __Pyx_PyDict_GetItemStr PyDict_GetItem
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment