Correcting memory allocation in LiteralStringWithPropertyStringPtr::NewFromCString #4641
Conversation
This file contains hidden or 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
Collaborator
Could you please point out the change that is justifying the description above? |
Collaborator
|
Found it; Good catch. |
Collaborator
|
CI errors are related to type casting. LGTM |
Contributor
Author
|
Ah yep, I see that I missed some usages in wabt when I tweaked the templating. I'll get that fixed tomorrow. |
sethbrenith
approved these changes
Feb 6, 2018
lib/Runtime/Library/ConcatString.cpp
Outdated
| ScriptContext * scriptContext = library->GetScriptContext(); | ||
| size_t cbDestString = (charCount + 1) * sizeof(WCHAR); | ||
| if ((CharCount)cbDestString < charCount) // overflow | ||
| if (charCount > MaxCharCount) // overflow |
Contributor
There was a problem hiding this comment.
"overflow" comment might be out of date; I think it was referring to arithmetic overflow when computing (charCount + 1) * sizeof(WCHAR)
…ewFromCString A confusion between bytes and character count meant that JsCreateString was creating strings that used twice as much space as they needed.
652a2ff to
1492900
Compare
chakrabot
pushed a commit
that referenced
this pull request
Feb 6, 2018
…gWithPropertyStringPtr::NewFromCString Merge pull request #4641 from MSLaguana:fixJsrtStringCreation A confusion between bytes and character count meant that JsCreateString was creating strings that used twice as much space as they needed. While I was at it, I also tried to clean up the types in `Utf8Helper.h` to make it more clear what the values referred to.
Contributor
Author
|
Thanks for the reviews! |
chakrabot
pushed a commit
that referenced
this pull request
Feb 6, 2018
… LiteralStringWithPropertyStringPtr::NewFromCString Merge pull request #4641 from MSLaguana:fixJsrtStringCreation A confusion between bytes and character count meant that JsCreateString was creating strings that used twice as much space as they needed. While I was at it, I also tried to clean up the types in `Utf8Helper.h` to make it more clear what the values referred to.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
A confusion between bytes and character count meant that JsCreateString
was creating strings that used twice as much space as they needed.
While I was at it, I also tried to clean up the types in
Utf8Helper.hto make it more clear what the values referred to.