Skip to content

Fix Corellium shutdown before connection #1218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xusheng6 wants to merge 1 commit into
base: dev
Choose a base branch
from
+7 −4
Open

Fix Corellium shutdown before connection #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions core/adapters/corelliumadapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@ bool CorelliumAdapter::Detach()
auto connector = m_rspConnector.load();
if (connector)
connector->SendPayload(RspData("D"));
this->m_socket->Kill();
if (m_socket)
m_socket->Kill();
m_isTargetRunning = false;
InvalidateCache();

Expand All @@ -312,7 +313,8 @@ bool CorelliumAdapter::Quit()
auto connector = m_rspConnector.load();
if (connector)
connector->SendPayload(RspData("k"));
this->m_socket->Kill();
if (m_socket)
m_socket->Kill();
m_isTargetRunning = false;
InvalidateCache();

Expand Down Expand Up @@ -900,7 +902,8 @@ DebugStopReason CorelliumAdapter::ResponseHandler()
dbgevt.data.exitData.exitCode = m_exitCode;
PostDebuggerEvent(dbgevt);

this->m_socket->Kill();
if (m_socket)
m_socket->Kill();
m_isTargetRunning = false;

m_rspConnector.store(nullptr);
Expand Down
2 changes: 1 addition & 1 deletion core/adapters/corelliumadapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ namespace BinaryNinjaDebugger

using register_pair = std::pair<std::string, RegisterInfo>;

Socket* m_socket;
Socket* m_socket = nullptr;
AtomicRspConnector m_rspConnector;

std::map<std::string, RegisterInfo> m_registerInfo{};
Expand Down