summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorKristján Valur Jónsson <sweskman@gmail.com>2013-03-19 22:35:28 (GMT)
committerKristján Valur Jónsson <sweskman@gmail.com>2013-03-19 22:35:28 (GMT)
commita251b37179cb4c3ba6f177a50b6f52f89ad1dd13 (patch)
tree03b2bffaca21d3d119bbaafa8bde96238ac11d08 /Modules
parent41b977c453879b8c53a504546bfe803ec505987f (diff)
parent5aed330e37c60b67e9ac87dc5afbf66b21e8a978 (diff)
downloadcpython-a251b37179cb4c3ba6f177a50b6f52f89ad1dd13.zip
cpython-a251b37179cb4c3ba6f177a50b6f52f89ad1dd13.tar.gz
cpython-a251b37179cb4c3ba6f177a50b6f52f89ad1dd13.tar.bz2
#10296: Merge to 3.3
Diffstat (limited to 'Modules')
-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