#10296: Merge to 3.3

This commit is contained in:
Kristján Valur Jónsson 2013-03-19 15:35:28 -07:00
commit a251b37179
1 changed files with 5 additions and 0 deletions

View File

@ -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