mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 09:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

ext/ldap: Fix references for ldap_modify_batch() (#16121)

Browse Source 
Because I don't know how references work in PHP
This commit is contained in:
Gina Peter Banyard 2024-09-30 11:27:56 +01:00 committed by GitHub
parent d87711b9f4
commit 52b514bf62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/ldap/ldap.c
View File

@ -2560,6 +2560,7 @@ PHP_FUNCTION(ldap_modify_batch)
zval *modification_zv = NULL;
ZEND_HASH_FOREACH_VAL(modifications, modification_zv) {
ZVAL_DEREF(modification_zv);
if (Z_TYPE_P(modification_zv) != IS_ARRAY) {
zend_argument_type_error(3, "must only contain arrays");
RETURN_THROWS();
@ -2580,6 +2581,8 @@ PHP_FUNCTION(ldap_modify_batch)
zend_argument_value_error(3, "a modification entry must contain the \"" LDAP_MODIFY_BATCH_ATTRIB "\" option");
RETURN_THROWS();
}
ZVAL_DEREF(attrib);
if (UNEXPECTED(Z_TYPE_P(attrib) != IS_STRING)) {
zend_argument_type_error(3, "the value for option \"" LDAP_MODIFY_BATCH_ATTRIB "\" must be of type string, %s given", zend_zval_value_name(attrib));
RETURN_THROWS();
@ -2594,6 +2597,8 @@ PHP_FUNCTION(ldap_modify_batch)
zend_argument_value_error(3, "a modification entry must contain the \"" LDAP_MODIFY_BATCH_MODTYPE "\" option");
RETURN_THROWS();
}
ZVAL_DEREF(modtype_zv);
if (UNEXPECTED(Z_TYPE_P(modtype_zv) != IS_LONG)) {
zend_argument_type_error(3, "the value for option \"" LDAP_MODIFY_BATCH_MODTYPE "\" must be of type int, %s given", zend_zval_value_name(attrib));
RETURN_THROWS();
@ -2628,6 +2633,8 @@ PHP_FUNCTION(ldap_modify_batch)
}
continue;
}
ZVAL_DEREF(modification_values_zv);
if (Z_TYPE_P(modification_values_zv) != IS_ARRAY) {
zend_argument_type_error(3, "the value for option \"" LDAP_MODIFY_BATCH_VALUES "\" must be of type array, %s given", zend_zval_value_name(attrib));
RETURN_THROWS();

39
ext/ldap/tests/ldap_modify_batch_modifications_with_references.phpt
View File

@ -9,11 +9,20 @@ ldap
$ldap = ldap_connect('ldap://127.0.0.1:3333');
$valid_dn = "cn=userA,something";
$attrib = "attrib1";
$r =& $attrib;
$empty_list = [];
$modification_reference = [
&$empty_list,
];
try {
var_dump(ldap_modify_batch($ldap, $valid_dn, $modification_reference));
} catch (Throwable $e) {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
$attrib = "attrib\0with\0nul\0byte";
$modification_attrib_reference_string = [
[
"attrib" => $r,
"attrib" => &$attrib,
"modtype" => LDAP_MODIFY_BATCH_ADD,
"values" => ["value1"],
],
@ -24,12 +33,11 @@ try {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
$modtype = LDAP_MODIFY_BATCH_ADD;
$r =& $modtype;
$modtype = -10;
$modification_modtype_reference_int = [
[
"attrib" => "attrib1",
"modtype" => $r,
"modtype" => &$modtype,
"values" => ["value1"],
],
];
@ -40,13 +48,12 @@ try {
}
$values = ["value1"];
$r =& $values;
$values = [];
$modification_values_reference_array = [
[
"attrib" => "attrib1",
"modtype" => LDAP_MODIFY_BATCH_ADD,
"values" => $r,
"values" => &$values,
],
];
try {
@ -56,12 +63,8 @@ try {
}
?>
--EXPECTF--
Warning: ldap_modify_batch(): Batch Modify: Can't contact LDAP server in %s on line %d
bool(false)
Warning: ldap_modify_batch(): Batch Modify: Can't contact LDAP server in %s on line %d
bool(false)
Warning: ldap_modify_batch(): Batch Modify: Can't contact LDAP server in %s on line %d
bool(false)
--EXPECT--
ValueError: ldap_modify_batch(): Argument #3 ($modifications_info) a modification entry must only contain the keys "attrib", "modtype", and "values"
ValueError: ldap_modify_batch(): Argument #3 ($modifications_info) the value for option "attrib" must not contain null bytes
ValueError: ldap_modify_batch(): Argument #3 ($modifications_info) the value for option "modtype" must be LDAP_MODIFY_BATCH_ADD, LDAP_MODIFY_BATCH_REMOVE, LDAP_MODIFY_BATCH_REPLACE, or LDAP_MODIFY_BATCH_REMOVE_ALL
ValueError: ldap_modify_batch(): Argument #3 ($modifications_info) the value for option "values" must not be empty