phar: Reduce code duplication wrt error handling in phar_parse_zipfile() #20144
+4
−27
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
The PHAR_ZIP_FAIL and PHAR_ZIP_FAIL_FREE macros are almost the same. The reason the latter exists is because of a single error path where the error message is on the heap and needs to be freed. Instead, use a stack allocated variable for the error message so we can get rid of the duplicate macro code. This stack variable is big enough as the messages written by phar_verify_signature() are short.
|
Perhaps this should actually target 8.3 as this will make further fixes to the error handling code less error-prone... |
Girgias
approved these changes
Oct 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
The PHAR_ZIP_FAIL and PHAR_ZIP_FAIL_FREE macros are almost the same. The reason the latter exists is because of a single error path where the error message is on the heap and needs to be freed. Instead, use a stack allocated variable for the error message so we can get rid of the duplicate macro code. This stack variable is big enough as the messages written by phar_verify_signature() are short.