ext/zip: further micro optimisations. #20362
Open
+130
−51
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
Member
devnexen
commented
Nov 2, 2025
devnexen
commented
- forgotten remaining libzip < 1.0.0 code path.
- earlier return on invalid inputs from some ZipArchive methods.
devnexen
force-pushed
the
zip_min_upd2
branch
from
e06204f to
a951792
Compare
Girgias
reviewed
Nov 3, 2025
Comment on lines
2609
to
2624
| if (index < 0) { | ||
| RETURN_FALSE; | ||
| } |
Member
There was a problem hiding this comment.
I guess it might make sense to make those sorts of conditions a warning/value error in the future?
Member
Author
There was a problem hiding this comment.
Yes I kept "api compatible" for now on purpose.
ext/zip/php_zip.c
Outdated
Comment on lines
3019
to
3022
| if (method < 0) { | ||
| RETURN_FALSE; | ||
| } | ||
| RETVAL_BOOL(zip_compression_method_supported((zip_int32_t)method, enc)); |
Member
There was a problem hiding this comment.
Isn't this a problem if method is larger than a 32bit int but still positive on x64?
Girgias
reviewed
Nov 11, 2025
Comment on lines
2400
to
2403
| if (comp_method < -1 || comp_method > INT_MAX) { | ||
| zend_argument_value_error(2, "must be between 0 and %d", INT_MAX); | ||
| RETURN_THROWS(); | ||
| } |
Member
There was a problem hiding this comment.
Is it between 0 and INT_MAX or -1 and INT_MAX? Because the condition seems to indicate between -1 and INT_MAX
ext/zip/php_zip.c
Outdated
| zend_argument_value_error(1, "must be between 0 and %u", USHRT_MAX); | ||
| RETURN_THROWS(); | ||
| } | ||
| RETVAL_BOOL(zip_encryption_method_supported((zip_uint16_t)method, enc)); |
Member
There was a problem hiding this comment.
Suggested change
| RETVAL_BOOL(zip_encryption_method_supported((zip_uint16_t)method, enc)); | |
| RETURN_BOOL(zip_encryption_method_supported((zip_uint16_t)method, enc)); |
- forgotten remaining libzip < 1.0.0 code path. - earlier return on invalid inputs from some ZipArchive methods.
…dex(). and throw exception for these
TODO: fix mem leaks on encryption methods.
devnexen
force-pushed
the
zip_min_upd2
branch
from
71d066b to
a6925a2
Compare
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.