Merge

kristjanvalur · kristjanvalur · commit ece12222ce43 · 2013-03-19T15:57:19.000-07:00
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -397,6 +397,11 @@ static DWORD HandleException(EXCEPTION_POINTERS *ptrs,`
`397`	`397`	`{`
`398`	`398`	`*pdw = ptrs->ExceptionRecord->ExceptionCode;`
`399`	`399`	`record = ptrs->ExceptionRecord;`
	`400`	`+ /* We don't want to catch breakpoint exceptions, they are used to attach`
	`401`	`+ * a debugger to the process.`
	`402`	`+ */`
	`403`	`+ if (*pdw == EXCEPTION_BREAKPOINT)`
	`404`	`+ return EXCEPTION_CONTINUE_SEARCH;`
`400`	`405`	`return EXCEPTION_EXECUTE_HANDLER;`
`401`	`406`	`}`
`402`	`407`	`#endif`