summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristjan Valur Jonsson <sweskman@gmail.com>2012-12-21 11:22:29 (GMT)
committerKristjan Valur Jonsson <sweskman@gmail.com>2012-12-21 11:22:29 (GMT)
commitc51bafbbdaba456ee14de8c933f84d86489b5c91 (patch)
treec8c4d58a25c0984a003266f5dfa0bbdb1e4af9d3
parent9cb7bd2df486dbf67c03f950738ae6863dfb2617 (diff)
parent3cbdaa3fee9489570124c368c94ff84718c81dae (diff)
downloadcpython-c51bafbbdaba456ee14de8c933f84d86489b5c91.zip
cpython-c51bafbbdaba456ee14de8c933f84d86489b5c91.tar.gz
cpython-c51bafbbdaba456ee14de8c933f84d86489b5c91.tar.bz2
Merge with 3.2 : Don't DECREF the ctypes error_object without the GIL held.
-rw-r--r--Modules/_ctypes/callproc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index 09320cf..e940ec7 100644
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -817,11 +817,11 @@ static int _call_function_pointer(int flags,
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) {