Properly treat utf8-non-encodable yul literals. #11338
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
|
Should be fixed now. |
aarlt
reviewed
May 4, 2021
| lit.value = YulString{member(_node, "value").asString()}; | ||
| solAssert(member(_node, "hexValue").isString() || member(_node, "value").isString(), ""); | ||
| if (_node.isMember("hexValue")) | ||
| lit.value = YulString{util::asString(util::fromHex(member(_node, "hexValue").asString()))}; |
There was a problem hiding this comment.
Wouldn't it make sense to also use util::validateUTF8 here?
There was a problem hiding this comment.
No, why? Literals can be invalid utf8
hrkrshnn
reviewed
May 4, 2021
Changelog.md
Outdated
| @@ -10,6 +10,11 @@ Compiler Features: | |||
|
|
|||
|
|
|||
| Bugfixes: | |||
| * AST: Do not output value of Yul literal if it is not valid utf8. | |||
There was a problem hiding this comment.
Suggested change
| * AST: Do not output value of Yul literal if it is not valid utf8. | |
| * AST: Do not output value of Yul literal if it is not a valid utf8 string. |
|
Rebased and updated changelog. |
hrkrshnn
reviewed
May 4, 2021
| @@ -68,6 +68,7 @@ | |||
| "src": "79:6:1", | |||
| "value": | |||
| { | |||
| "hexValue": "37", | |||
There was a problem hiding this comment.
Value is 7, but hexValue is 37?
libyul/AsmJsonConverter.cpp
Outdated
| ret["value"] = _node.value.str(); | ||
| else | ||
| ret["value"] = Json::nullValue; | ||
| ret["hexValue"] = util::toHex(util::asBytes(_node.value.str())); |
There was a problem hiding this comment.
If it's an integer literal, should the hex value go through the byte-string conversion?
There was a problem hiding this comment.
Oh you are right, we should only have hexValue for string literals.
hrkrshnn
reviewed
May 5, 2021
hrkrshnn
approved these changes
May 5, 2021
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.
Suggestion cannot be applied right now. Please check back later.
References #11324