archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/ldap: Pass a HashTable directly to parse individual control

Browse source 
Rename function to not have a leading "_" at the same time
This commit is contained in:
Gina Peter Banyard 2024-10-03 00:17:23 +01:00
parent d7f946d28b
commit e01cde7b1b
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/ldap/ldap.c
View file

@ -406,7 +406,7 @@ static void _php_ldap_control_to_array(LDAP *ld, LDAPControl* ctrl, zval* array,
} }
} }
static int _php_ldap_control_from_array(LDAP *ld, LDAPControl** ctrl, zval* array) static int php_ldap_control_from_array(LDAP *ld, LDAPControl** ctrl, const HashTable *control_ht)
{ {
zval* val; zval* val;
zend_string *control_oid; zend_string *control_oid;
@ -415,7 +415,7 @@ static int _php_ldap_control_from_array(LDAP *ld, LDAPControl** ctrl, zval* arra
zend_string *tmpstring = NULL, **tmpstrings1 = NULL, **tmpstrings2 = NULL; zend_string *tmpstring = NULL, **tmpstrings1 = NULL, **tmpstrings2 = NULL;
size_t num_tmpstrings1 = 0, num_tmpstrings2 = 0; size_t num_tmpstrings1 = 0, num_tmpstrings2 = 0;
if ((val = zend_hash_str_find(Z_ARRVAL_P(array), "oid", sizeof("oid") - 1)) == NULL) { if ((val = zend_hash_str_find(control_ht, "oid", sizeof("oid") - 1)) == NULL) {
zend_value_error("%s(): Control must have an \"oid\" key", get_active_function_name()); zend_value_error("%s(): Control must have an \"oid\" key", get_active_function_name());
return -1; return -1;
} }
@ -426,7 +426,7 @@ static int _php_ldap_control_from_array(LDAP *ld, LDAPControl** ctrl, zval* arra
} }
bool control_iscritical = false; bool control_iscritical = false;
if ((val = zend_hash_str_find(Z_ARRVAL_P(array), "iscritical", sizeof("iscritical") - 1)) != NULL) { if ((val = zend_hash_str_find(control_ht, "iscritical", sizeof("iscritical") - 1)) != NULL) {
control_iscritical = zend_is_true(val); control_iscritical = zend_is_true(val);
} }
@ -435,7 +435,7 @@ static int _php_ldap_control_from_array(LDAP *ld, LDAPControl** ctrl, zval* arra
bool control_value_alloc = false; bool control_value_alloc = false;
int rc = LDAP_SUCCESS; int rc = LDAP_SUCCESS;
if ((val = zend_hash_find(Z_ARRVAL_P(array), ZSTR_KNOWN(ZEND_STR_VALUE))) != NULL) { if ((val = zend_hash_find(control_ht, ZSTR_KNOWN(ZEND_STR_VALUE))) != NULL) {
if (Z_TYPE_P(val) != IS_ARRAY) { if (Z_TYPE_P(val) != IS_ARRAY) {
tmpstring = zval_get_string(val); tmpstring = zval_get_string(val);
if (EG(exception)) { if (EG(exception)) {
@ -786,7 +786,7 @@ static LDAPControl** php_ldap_controls_from_array(LDAP *ld, const HashTable *con
break; break;
} }
if (_php_ldap_control_from_array(ld, ctrlp, ctrlarray) == LDAP_SUCCESS) { if (php_ldap_control_from_array(ld, ctrlp, Z_ARRVAL_P(ctrlarray)) == LDAP_SUCCESS) {
++ctrlp; ++ctrlp;
} else { } else {
error = 1; error = 1;