Fixed #11874 (leading 0s ignored by debugger) #8479
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -493,23 +493,25 @@ void MemoryWidget::OnSetValue() | |||
| else | |||
| { | |||
| bool good_value; | |||
| u64 value = m_data_edit->text().toULongLong(&good_value, 16); | |||
| const auto& text = m_data_edit->text(); | |||
| int length = text.startsWith(QStringLiteral("0x")) ? text.size() - 2 : text.size(); | |||
There was a problem hiding this comment.
What about uppercase 0X?
lioncash
reviewed
Nov 21, 2019
| @@ -493,23 +493,25 @@ void MemoryWidget::OnSetValue() | |||
| else | |||
| { | |||
| bool good_value; | |||
| u64 value = m_data_edit->text().toULongLong(&good_value, 16); | |||
| const auto& text = m_data_edit->text(); | |||
There was a problem hiding this comment.
text() returns a QString by value, so taking it by const reference, while valid, is somewhat visually misleading.
| @@ -493,23 +493,25 @@ void MemoryWidget::OnSetValue() | |||
| else | |||
| { | |||
| bool good_value; | |||
| u64 value = m_data_edit->text().toULongLong(&good_value, 16); | |||
| const auto& text = m_data_edit->text(); | |||
| int length = text.startsWith(QStringLiteral("0x")) ? text.size() - 2 : text.size(); | |||
There was a problem hiding this comment.
This and value can both be made const.
|
@CookiePLMonster Yep, complete oversight. @lioncash So it is, I'm not too familiar with Qt so just assumed. I additionally noticed and fixed a typo in the code for setting ASCII values, the arguments to WriteU8 were swapped. |
|
Looks good now, but please squash so those "PR feedback" commits disappear. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Fixes both issues from the report.
For set value:
The original code converts the string into a value and then attempts to work out the size of the input by downcasting and comparing. This breaks for leading zeros as, for example, 0042 == (u8)0042. The fix calculates the correct length from the original string, taking into account the possibility that the string is prefixed by "0x".
For copy hex:
The code already attempts to take the first "length" characters, however incorrectly converts/pads the value and so copies the first "length" nonzero characters. This meant that copying the 01 of 01 23 would result in the string 12 being copied. The fix always fully pads the read value and then correctly takes the leftmost characters.