[sgen] Fix string size inconsistency between alloc/scan #10355
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
This could lead to crashes when having strings with size at the LOS boundary. mono#10309
lewurm
reviewed
Aug 29, 2018
| @@ -6998,7 +6998,7 @@ mono_object_get_size (MonoObject* o) | |||
|
|
|||
| MonoClass* klass = mono_object_class (o); | |||
| if (klass == mono_defaults.string_class) { | |||
| return sizeof (MonoString) + 2 * mono_string_length ((MonoString*) o) + 2; | |||
| return MONO_SIZEOF_MONO_STRING + 2 * mono_string_length ((MonoString*) o) + 2; | |||
There was a problem hiding this comment.
To illustrate the issue, see: https://gcc.godbolt.org/z/g1rhHc
It wasn't obvious to me that sizeof includes the empty chars array. Good catch.
lewurm
approved these changes
Aug 29, 2018
kumpera
approved these changes
Aug 29, 2018
|
@monojenkins squash |
|
should we backport this change? |
|
yes, I set the target for -06 or do you consider it to be too risky? |
|
@monojenkins backport to 2018-08 |
|
@monojenkins backport to 2018-06 |
This was referenced Aug 31, 2018
picenka21
pushed a commit
to picenka21/runtime
that referenced
this pull request
Feb 18, 2022
[sgen] Fix string size inconsistency between alloc/scan This could lead to crashes when having strings with size at the LOS boundary. mono/mono#10309 <!-- Thank you for your Pull Request! If you are new to contributing to Mono, please try to do your best at conforming to our coding guidelines http://www.mono-project.com/community/contributing/coding-guidelines/ but don't worry if you get something wrong. One of the project members will help you to get things landed. Does your pull request fix any of the existing issues? Please use the following format: Fixes #issue-number --> Commit migrated from mono/mono@609f653
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.
This could lead to crashes when having strings with size at the LOS boundary.
#10309