Fix #63208: BSTR to PHP string conversion not binary safe#5766
Closed
cmb69 wants to merge 3 commits intophp:PHP-7.3from
Closed
Fix #63208: BSTR to PHP string conversion not binary safe#5766cmb69 wants to merge 3 commits intophp:PHP-7.3from
cmb69 wants to merge 3 commits intophp:PHP-7.3from
Conversation
A `BSTR` is similar to a `zend_string`; it stores the length of the string just before the actual string, and thus the string may contain NUL bytes. However, `php_com_olestring_to_string()` is supposed to deal with arbitrary `OLECHAR*`s which may not be `BSTR`s, so we introduce `php_com_bstr_to_string()` and use it for the only case where we actually have to deal with `BSTR`s which may contain NUL bytes. Contrary to `php_com_olestring_to_string()` we return a `zend_string`, so we can save the re-allocation when converting to a `zval`.
nikic
reviewed
Jun 25, 2020
nikic
reviewed
Jun 29, 2020
Instead of allocating a temporary `OLECHAR` buffer, we allocate the final `BSTR` right away, and do the multibyte conversion into its buffer. We also refactor to guard statements for better readability.
nikic
approved these changes
Jun 29, 2020
nikic
reviewed
Jun 29, 2020
Member
Author
|
Thanks! Applied as a385cfa. |
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
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.
A
BSTRis similar to azend_string; it stores the length of thestring just before the actual string, and thus the string may contain
NUL bytes. However,
php_com_olestring_to_string()is supposed todeal with arbitrary
OLECHAR*s which may not beBSTRs, so weintroduce
php_com_bstr_to_string()and use it for the only case wherewe actually have to deal with
BSTRs which may contain NUL bytes.Contrary to
php_com_olestring_to_string()we return azend_string,so we can save the re-allocation when converting to a
zval.