ext/ldap: ldap_read/ldap_list/ldap_search update. #17426
Conversation
This file contains 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
Feb 4, 2025
ext/ldap/ldap.c
Outdated
| @@ -1448,7 +1448,8 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) | |||
| zend_string *base_dn_str = NULL; | |||
| HashTable *filter_ht = NULL; | |||
| zend_string *filter_str = NULL; | |||
| zend_long attrsonly, sizelimit, timelimit, deref; | |||
| zend_long sizelimit = 0, timelimit = 0, deref = LDAP_DEREF_NEVER; | |||
There was a problem hiding this comment.
I'd go with the actual default values right away:
Suggested change
| zend_long sizelimit = 0, timelimit = 0, deref = LDAP_DEREF_NEVER; | |
| zend_long sizelimit = -1, timelimit = -1, deref = LDAP_DEREF_NEVER; |
And then remove the switch (argcount) { and the then superfluous ldap_* variables. That would at least avoid making this already too large function even larger.
ext/ldap/ldap.c
Outdated
| @@ -1465,13 +1466,28 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) | |||
| Z_PARAM_ARRAY_HT_OR_STR(filter_ht, filter_str) | |||
| Z_PARAM_OPTIONAL | |||
| Z_PARAM_ARRAY_EX(attrs, 0, 1) | |||
| Z_PARAM_LONG(attrsonly) | |||
| Z_PARAM_BOOL(attrsonly) | |||
There was a problem hiding this comment.
That would be a BC break; perhaps better to wait for PHP 9?
checks sizelimit/timelimit checks and attrsonly from int to bool.
devnexen
force-pushed
the
php_do_ldap_search_check
branch
from
6693118 to
8623c73
Compare
cmb69
reviewed
Feb 4, 2025
Comment on lines
-1755
to
+1751
| php_set_opts(ld->link, old_ldap_sizelimit, old_ldap_timelimit, old_ldap_deref, &ldap_sizelimit, &ldap_timelimit, &ldap_deref); | ||
| php_set_opts(ld->link, old_ldap_sizelimit, old_ldap_timelimit, old_ldap_deref, (int *)&sizelimit, (int *)&timelimit, (int *)&deref); |
There was a problem hiding this comment.
Oh, didn't notice this earlier. These casts won't properly work for big-endian architectures, but on the other hand, we're not using the variables afterwards, so might be okay. A follow-up PR could add support for passing NULL values to php_set_opts() (which then would not assign the out parameters).
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.
checks sizelimit/timelimit checks and attrsonly from int to bool.