Skip to content

Fix NULL deref on high modification key #18331

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

Closed
wants to merge 1 commit into from
Closed

Fix NULL deref on high modification key #18331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions ext/ldap/ldap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2785,12 +2785,12 @@ PHP_FUNCTION(ldap_modify_batch)
ldap_mods = safe_emalloc((num_mods+1), sizeof(LDAPMod *), 0);

/* for each modification */
for (i = 0; i < num_mods; i++) {
i = 0;
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(mods), fetched) {
/* allocate the modification struct */
ldap_mods[i] = safe_emalloc(1, sizeof(LDAPMod), 0);

/* fetch the relevant data */
fetched = zend_hash_index_find(Z_ARRVAL_P(mods), i);
mod = fetched;

_ldap_hash_fetch(mod, LDAP_MODIFY_BATCH_ATTRIB, &attrib);
Expand Down Expand Up @@ -2855,7 +2855,9 @@ PHP_FUNCTION(ldap_modify_batch)
/* NULL-terminate values */
ldap_mods[i]->mod_bvalues[num_modvals] = NULL;
}
}

i++;
} ZEND_HASH_FOREACH_END();

/* NULL-terminate modifications */
ldap_mods[num_mods] = NULL;
Expand Down
13 changes: 13 additions & 0 deletions ext/ldap/tests/ldap_modify_batch_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@ $mods = array(
)
);

var_dump(ldap_modify_batch($link, "dc=my-domain,$base", $mods));

// high key with invalid attribute type
$mods = [
99999 => [
"attrib" => "weirdAttribute",
"modtype" => LDAP_MODIFY_BATCH_ADD,
"values" => ["value1"],
],
];
var_dump(ldap_modify_batch($link, "dc=my-domain,$base", $mods));
?>
--CLEAN--
Expand All @@ -81,3 +91,6 @@ bool(false)

Warning: ldap_modify_batch(): Batch Modify: Undefined attribute type in %s on line %d
bool(false)

Warning: ldap_modify_batch(): Batch Modify: Undefined attribute type in %s on line %d
bool(false)
Loading