Skip to content

ext/ldap: Refactor php_ldap_do_modify() #16146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Oct 1, 2024
Merged

ext/ldap: Refactor php_ldap_do_modify() #16146

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6f5c9af
ext/ldap: Add tests for php_ldap_do_modify()
Girgias Sep 30, 2024
2bac602
ext/ldap: php_ldap_do_modify() throw ValueError when entries array is…
Girgias Sep 30, 2024
c76c934
ext/ldap: Handle attribute => value case directly
Girgias Sep 30, 2024
888018b
ext/ldap: Ensure list of attribute values is not empty
Girgias Sep 30, 2024
891a47b
ext/ldap: Check that attribute values is a list before traversal
Girgias Sep 30, 2024
037880b
ext/ldap: Reduce scope of variables
Girgias Sep 30, 2024
d149cf8
ext/ldap: Use HASH_FOREACH macro
Girgias Sep 30, 2024
fb0051f
ext/ldap: Zero out arrays and traverse them as NULL terminated list
Girgias Sep 30, 2024
6d44901
ext/ldap: Refactor loop to a HASH_FOREACH loop
Girgias Sep 30, 2024
b3c0743
ext/ldap: Promote warning to ValueError if array is not a dict
Girgias Sep 30, 2024
be1f7c2
ext/ldap: Check array key does not have any nul bytes
Girgias Sep 30, 2024
ff25d5b
ext/ldap: Check that array key is not empty
Girgias Sep 30, 2024
0ef85bb
ext/ldap: Rename variable and move closer to usage site
Girgias Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions ext/ldap/ldap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2201,9 +2201,8 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, int ext)
LDAPControl **lserverctrls = NULL;
ldap_resultdata *result;
LDAPMessage *ldap_res;
int i, j, num_attribs, msgid;
int i, num_attribs, msgid;
size_t dn_len;
int *num_berval;
zend_string *attribute;
zend_ulong index;
int is_full_add=0; /* flag for full add operation so ldap_mod_add can be put back into oper, gerrit THomson */
Expand All @@ -2222,7 +2221,8 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, int ext)
}

ldap_mods = safe_emalloc((num_attribs+1), sizeof(LDAPMod *), 0);
num_berval = safe_emalloc(num_attribs, sizeof(int), 0);
/* Zero out the list */
memset(ldap_mods, 0, sizeof(LDAPMod *) * (num_attribs+1));
zend_hash_internal_pointer_reset(Z_ARRVAL_P(entry));

/* added by gerrit thomson to fix ldap_add using ldap_mod_add */
Expand All @@ -2242,8 +2242,6 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, int ext)
} else {
php_error_docref(NULL, E_WARNING, "Unknown attribute in the data");
RETVAL_FALSE;
num_berval[i] = 0;
num_attribs = i + 1;
ldap_mods[i]->mod_bvalues = NULL;
goto cleanup;
}
Expand All @@ -2257,12 +2255,9 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, int ext)
convert_to_string(value);
if (EG(exception)) {
RETVAL_FALSE;
num_berval[i] = 0;
num_attribs = i + 1;
ldap_mods[i]->mod_bvalues = NULL;
goto cleanup;
}
num_berval[i] = 1;
ldap_mods[i]->mod_bvalues = safe_emalloc(2, sizeof(struct berval *), 0);
ldap_mods[i]->mod_bvalues[0] = (struct berval *) emalloc (sizeof(struct berval));
ldap_mods[i]->mod_bvalues[0]->bv_val = Z_STRVAL_P(value);
Expand All @@ -2274,30 +2269,25 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, int ext)
if (num_values == 0) {
zend_argument_value_error(3, "list of attribute values must not be empty");
RETVAL_FALSE;
num_berval[i] = 0;
num_attribs = i + 1;
ldap_mods[i]->mod_bvalues = NULL;
goto cleanup;
}
if (!zend_array_is_list(Z_ARRVAL_P(value))) {
zend_argument_value_error(3, "must be a list of attribute values");
RETVAL_FALSE;
num_berval[i] = 0;
num_attribs = i + 1;
ldap_mods[i]->mod_bvalues = NULL;
goto cleanup;
}

num_berval[i] = num_values;
ldap_mods[i]->mod_bvalues = safe_emalloc((num_values + 1), sizeof(struct berval *), 0);
/* Zero out the list */
memset(ldap_mods[i]->mod_bvalues, 0, sizeof(struct berval *) * (num_values+1));

zend_ulong attribute_value_index = 0;
zval *attribute_value = NULL;
ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARRVAL_P(value), attribute_value_index, attribute_value) {
convert_to_string(attribute_value);
if (EG(exception)) {
num_berval[i] = (int)attribute_value_index;
num_attribs = i + 1;
RETVAL_FALSE;
goto cleanup;
}
Expand Down Expand Up @@ -2368,15 +2358,19 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, int ext)
}

cleanup:
for (i = 0; i < num_attribs; i++) {
efree(ldap_mods[i]->mod_type);
for (j = 0; j < num_berval[i]; j++) {
efree(ldap_mods[i]->mod_bvalues[j]);
for (LDAPMod **ptr = ldap_mods; *ptr != NULL; ptr++) {
LDAPMod *mod = *ptr;
if (mod->mod_type) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

efree doesn't need null checks.

efree(mod->mod_type);
}
if (mod->mod_bvalues != NULL) {
for (struct berval **bval_ptr = mod->mod_bvalues; *bval_ptr != NULL; bval_ptr++) {
efree(*bval_ptr);
}
efree(mod->mod_bvalues);
}
efree(ldap_mods[i]->mod_bvalues);
efree(ldap_mods[i]);
efree(mod);
}
efree(num_berval);
efree(ldap_mods);

if (lserverctrls) {
Expand Down