Skip to content

Improve common hex format handling in goto address input #561

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
LogicalJoe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve common hex format handling in goto address input #561

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
16 changes: 11 additions & 5 deletions gui/qt/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,23 @@ QString resolveAddressOrEquate(const QString &input, bool *ok) {
}

QString s = in;
if (s.startsWith(QStringLiteral("0X"))) {
s = s.mid(2);
if (s.startsWith('$')) {
s.remove(0, 1);
} else if (s.startsWith(QStringLiteral("0X"))) {
s.remove(0, 2);
} else if (s.endsWith('H')) {
s.chop(1);
}
if (s.isEmpty() || s.length() > 6) {
if (s.isEmpty() || s.toStdString().find_first_not_of("0123456789ABCDEF") != std::string::npos) {
return {};
}
if (s.toStdString().find_first_not_of("0123456789ABCDEF") != std::string::npos) {

bool valid = false;
const uint32_t value = s.toUInt(&valid, 16);
if (!valid || value > 0xFFFFFF) {
return {};
}

const auto value = static_cast<uint32_t>(hex2int(in));
if (ok) { *ok = true; }
return int2hex(value, 6);
}
Expand Down
Loading