From 9e3eee9cfecb2f19d399796bb49ed6a479ca993e Mon Sep 17 00:00:00 2001 From: Aaron Smith Date: Thu, 3 Jan 2019 00:54:08 +0000 Subject: Check that a pointer is valid and fix a log message on Windows --- lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lldb') diff --git a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp index 48855b9ce0b..3fe5ab7804c 100644 --- a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp +++ b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp @@ -395,7 +395,7 @@ Status ProcessWindows::DoResume() { SetPrivateState(eStateRunning); } } else { - LLDB_LOG(log, "error: process %I64u is in state %u. Returning...", + LLDB_LOG(log, "error: process {0} is in state {1}. Returning...", m_session_data->m_debugger->GetProcess().GetProcessId(), GetPrivateState()); } @@ -884,7 +884,7 @@ void ProcessWindows::OnExitProcess(uint32_t exit_code) { // If the process exits before any initial stop then notify the debugger // of the error otherwise WaitForDebuggerConnection() will be blocked. // An example of this issue is when a process fails to load a dependent DLL. - if (!m_session_data->m_initial_stop_received) { + if (m_session_data && !m_session_data->m_initial_stop_received) { Status error(exit_code, eErrorTypeWin32); OnDebuggerError(error, 0); } -- cgit v1.2.3