Skip to content

Fix crash when architecture string has no hyphen after colon #1001

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

Merged
xusheng6 merged 1 commit into from
Feb 26, 2026
Merged

Fix crash when architecture string has no hyphen after colon #1001

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
4 changes: 3 additions & 1 deletion core/adapters/corelliumadapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ bool CorelliumAdapter::LoadRegisterInfo()
if (architecture.find(':') != std::string::npos)
{
architecture.erase(0, architecture.find(':') + 1);
architecture.replace(architecture.find('-'), 1, "_");
auto hyphenPos = architecture.find('-');
if (hyphenPos != std::string::npos)
architecture.replace(hyphenPos, 1, "_");
}
m_remoteArch = architecture;

Expand Down
4 changes: 3 additions & 1 deletion core/adapters/esrevenadapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ bool EsrevenAdapter::LoadRegisterInfo()
if (architecture.find(':') != std::string::npos)
{
architecture.erase(0, architecture.find(':') + 1);
architecture.replace(architecture.find('-'), 1, "_");
auto hyphenPos = architecture.find('-');
if (hyphenPos != std::string::npos)
architecture.replace(hyphenPos, 1, "_");
}
m_remoteArch = architecture;

Expand Down
4 changes: 3 additions & 1 deletion core/adapters/gdbadapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ bool GdbAdapter::LoadRegisterInfo()
if (architecture.find(':') != std::string::npos)
{
architecture.erase(0, architecture.find(':') + 1);
architecture.replace(architecture.find('-'), 1, "_");
auto hyphenPos = architecture.find('-');
if (hyphenPos != std::string::npos)
architecture.replace(hyphenPos, 1, "_");
}
m_remoteArch = architecture;

Expand Down