#10296: Merge to 3.3

a251b371 · Kristján Valur Jónsson · 41b977c4 · 5aed330e · a251b371
Commit a251b371 authored Mar 19, 2013 by Kristján Valur Jónsson
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

Modules/_ctypes/callproc.c Modules/_ctypes/callproc.c +5 -0

No files found.
--- 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