summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristján Valur Jónsson <sweskman@gmail.com>2013-03-19 23:00:01 (GMT)
committerKristján Valur Jónsson <sweskman@gmail.com>2013-03-19 23:00:01 (GMT)
commitd6e9f32b799c17bc5f1c57f46ae67e7a4da3f673 (patch)
tree1adfffe0c33ebdf73f7aafe4b77bb7e6f917cc7a
parent3cc791c5a19ccf6d3f2a8465d935e160b0aeb8d0 (diff)
parenta251b37179cb4c3ba6f177a50b6f52f89ad1dd13 (diff)
downloadcpython-d6e9f32b799c17bc5f1c57f46ae67e7a4da3f673.zip
cpython-d6e9f32b799c17bc5f1c57f46ae67e7a4da3f673.tar.gz
cpython-d6e9f32b799c17bc5f1c57f46ae67e7a4da3f673.tar.bz2
Merge
-rw-r--r--Modules/_ctypes/callproc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index d8e1f30..f5d8f52 100644
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -397,6 +397,11 @@ static DWORD HandleException(EXCEPTION_POINTERS *ptrs,
{
*pdw = ptrs->ExceptionRecord->ExceptionCode;
*record = *ptrs->ExceptionRecord;
+ /* We don't want to catch breakpoint exceptions, they are used to attach
+ * a debugger to the process.
+ */
+ if (*pdw == EXCEPTION_BREAKPOINT)
+ return EXCEPTION_CONTINUE_SEARCH;
return EXCEPTION_EXECUTE_HANDLER;
}
#endif