Prevent double-free of Phar ZIP stream #6578
Closed
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
We must not alias the closed stream to `phar_archive_data.fp`.
nikic
reviewed
Jan 5, 2021
| @@ -683,6 +681,8 @@ int phar_parse_zipfile(php_stream *fp, char *fname, size_t fname_len, char *alia | |||
| return FAILURE; | |||
| } | |||
|
|
|||
| mydata->fp = fp; | |||
There was a problem hiding this comment.
Looks like there's a bunch of usages above that use PHAR_ZIP_FAIL rather than phar_destroy_phar_data -- just want to double check whether using phar_destroy_phar_data is really okay here.
There was a problem hiding this comment.
Ah, right! At least for consistency, we should use the PHAR_ZIP_FAIL() macro. However, not calling phar_destroy_phar_data() keeps some memory allocated until request shutdown; that is handled differently in ext/phar/tar.c. Might be worthwhile to give this a closer review.
nikic
approved these changes
Jan 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.
We must not alias the closed stream to
phar_archive_data.fp.