Fix: php_binary_init: WIN32 binary_location use after free #8788
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
cmb69
reviewed
Jun 15, 2022
There was a problem hiding this comment.
The additional check for binary_location looks right, but that should probably target PHP-8.0.
And I wonder why we use malloc() and friends here, instead of pemalloc() and friends. Since the latter are infallible, we could remove some of the checks and error handling.
| @@ -382,13 +382,13 @@ static void php_binary_init(void) | |||
| free(binary_location); | |||
| binary_location = NULL; | |||
| } | |||
| } else if (!VCWD_REALPATH(sapi_module.executable_location, binary_location) || VCWD_ACCESS(binary_location, X_OK)) { | |||
| } else if (binary_location && !VCWD_REALPATH(sapi_module.executable_location, binary_location) || VCWD_ACCESS(binary_location, X_OK)) { | |||
There was a problem hiding this comment.
Good catch, but this is not Windows code, but rather the code for other systems.
Comment on lines
-390
to
+391
| #endif | ||
| PG(php_binary) = binary_location; | ||
| #endif |
There was a problem hiding this comment.
Moving that line into the #else body would cause Windows to not set PG(php_binary).
|
I'll create a new pull request targeting php8 |
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.
No description provided.