| commit | 3cbdaa3fee9489570124c368c94ff84718c81dae | [log] [tgz] |
|---|---|---|
| author | Kristjan Valur Jonsson <sweskman@gmail.com> | Fri Dec 21 11:20:53 2012 +0000 |
| committer | Kristjan Valur Jonsson <sweskman@gmail.com> | Fri Dec 21 11:20:53 2012 +0000 |
| tree | 417f5bfe70bcf79636163294ebd75536de3d48df | |
| parent | 7bd61cbc030663ac688364260d2142d09678b2a3 [diff] | |
| parent | 9946bd69fadefdb1a4f68ae2770eae9b09a3ed86 [diff] |
Merge with 3.1 : Don't DECREF the ctypes error_object without the GIL held.
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index 3465995..ef14e91 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c
@@ -825,11 +825,11 @@ space[0] = errno; errno = temp; } - Py_XDECREF(error_object); #ifdef WITH_THREAD if ((flags & FUNCFLAG_PYTHONAPI) == 0) Py_BLOCK_THREADS #endif + Py_XDECREF(error_object); #ifdef MS_WIN32 #ifndef DONT_USE_SEH if (dwExceptionCode) {