From 6b2f69dd10e5de12c21e0f34b87a7ba0cab9852b Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Fri, 14 Oct 2016 15:27:54 +0100 Subject: Also treat DBG_PRINTEXCEPTION* as debug exceptions Windows 10 now raises an exception when OutputDebugString* are called: (https://ntquery.wordpress.com/2015/09/07/windows-10-new-anti-debug-outputdebugstringw/) This change ignores these exception types such that they're not falsely identified as a crash. BUG= Change-Id: I1326212662d46e16407681d5ea6377f63ee188ce Reviewed-on: https://chromium-review.googlesource.com/398998 Reviewed-by: Mark Mentovai --- src/client/windows/handler/exception_handler.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/client/windows') diff --git a/src/client/windows/handler/exception_handler.cc b/src/client/windows/handler/exception_handler.cc index 1f7b19f9..fc22cd9f 100644 --- a/src/client/windows/handler/exception_handler.cc +++ b/src/client/windows/handler/exception_handler.cc @@ -476,7 +476,9 @@ LONG ExceptionHandler::HandleException(EXCEPTION_POINTERS* exinfo) { DWORD code = exinfo->ExceptionRecord->ExceptionCode; LONG action; bool is_debug_exception = (code == EXCEPTION_BREAKPOINT) || - (code == EXCEPTION_SINGLE_STEP); + (code == EXCEPTION_SINGLE_STEP) || + (code == DBG_PRINTEXCEPTION_C) || + (code == DBG_PRINTEXCEPTION_WIDE_C); if (code == EXCEPTION_INVALID_HANDLE && current_handler->consume_invalid_handle_exceptions_) { -- cgit v1.2.1