generic-library/breakpad
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SuspendThread returns a DWORD value, so checking the return value with ">= 0"

Browse Source 
doesn't work.  On failure, the return value is (DWORD) -1 (which is
0xFFFFFFFF).

http://breakpad.appspot.com/491002/



git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1075 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
ivan.penkov@gmail.com 2012-11-01 21:49:06 +00:00
parent c14298db63
commit 6b91f41a7c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/windows/handler/exception_handler.cc
View File

@ -44,6 +44,9 @@ namespace google_breakpad {
static const int kWaitForHandlerThreadMs = 60000; static const int kWaitForHandlerThreadMs = 60000;
static const int kExceptionHandlerThreadInitialStackSize = 64 * 1024; static const int kExceptionHandlerThreadInitialStackSize = 64 * 1024;
// As documented on MSDN, on failure SuspendThread returns (DWORD) -1
static const DWORD kFailedToSuspendThread = static_cast<DWORD>(-1);
// This is passed as the context to the MinidumpWriteDump callback. // This is passed as the context to the MinidumpWriteDump callback.
typedef struct { typedef struct {
AppMemoryList::const_iterator iter; AppMemoryList::const_iterator iter;
@ -747,7 +750,7 @@ bool ExceptionHandler::WriteMinidumpForChild(HANDLE child,
EXCEPTION_RECORD ex; EXCEPTION_RECORD ex;
CONTEXT ctx; CONTEXT ctx;
EXCEPTION_POINTERS exinfo = { NULL, NULL }; EXCEPTION_POINTERS exinfo = { NULL, NULL };
DWORD last_suspend_count = -1; DWORD last_suspend_count = kFailedToSuspendThread;
HANDLE child_thread_handle = OpenThread(THREAD_GET_CONTEXT | HANDLE child_thread_handle = OpenThread(THREAD_GET_CONTEXT |
THREAD_QUERY_INFORMATION | THREAD_QUERY_INFORMATION |
THREAD_SUSPEND_RESUME, THREAD_SUSPEND_RESUME,
@ -757,7 +760,7 @@ bool ExceptionHandler::WriteMinidumpForChild(HANDLE child,
// non-fatal error. // non-fatal error.
if (child_thread_handle != NULL) { if (child_thread_handle != NULL) {
last_suspend_count = SuspendThread(child_thread_handle); last_suspend_count = SuspendThread(child_thread_handle);
if (last_suspend_count >= 0) { if (last_suspend_count != kFailedToSuspendThread) {
ctx.ContextFlags = CONTEXT_ALL; ctx.ContextFlags = CONTEXT_ALL;
if (GetThreadContext(child_thread_handle, &ctx)) { if (GetThreadContext(child_thread_handle, &ctx)) {
memset(&ex, 0, sizeof(ex)); memset(&ex, 0, sizeof(ex));
@ -780,7 +783,7 @@ bool ExceptionHandler::WriteMinidumpForChild(HANDLE child,
exinfo.ExceptionRecord ? &exinfo : NULL, exinfo.ExceptionRecord ? &exinfo : NULL,
NULL, child, false); NULL, child, false);
if (last_suspend_count >= 0) { if (last_suspend_count != kFailedToSuspendThread) {
ResumeThread(child_thread_handle); ResumeThread(child_thread_handle);
} }