php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix GH-18015: Error messages for ldap_mod_replace are confusing

Browse Source 
Closes GH-18053.
This commit is contained in:
Niels Dossche
2025-03-13 22:00:43 +01:00
parent 4b9c72f329
commit 6717947ffe
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -39,6 +39,10 @@ PHP NEWS
. Fixed bug GH-17984 (calls with arguments as array with references).
(David Carlier)
- LDAP:
. Fixed bug GH-18015 (Error messages for ldap_mod_replace are confusing).
(nielsdos)
- Mbstring:
. Fixed bug GH-17989 (mb_output_handler crash with unset
http_output_conv_mimetypes). (nielsdos)

2
ext/ldap/ldap.c
View File

@@ -2278,7 +2278,7 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, int ext)
ldap_mods[i]->mod_bvalues[0]->bv_len = Z_STRLEN_P(value);
} else {
if (!php_ldap_is_numerically_indexed_array(Z_ARRVAL_P(value))) {
zend_argument_value_error(3, "must be an array with numeric keys");
zend_argument_value_error(3, "attribute \"%s\" must be an array with numeric keys", ZSTR_VAL(attribute));
RETVAL_FALSE;
num_berval[i] = 0;
num_attribs = i + 1;

2
ext/ldap/tests/ldap_add_error.phpt
View File

@@ -104,7 +104,7 @@ Warning: ldap_add(): Add: Already exists in %s on line %d
bool(false)
string(14) "Already exists"
int(68)
ldap_add(): Argument #3 ($entry) must be an array with numeric keys
ldap_add(): Argument #3 ($entry) attribute "objectClass" must be an array with numeric keys
Warning: ldap_add(): Add: Undefined attribute type in %s on line %d
bool(false)