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

Fix GH-16389: Assertion failure in ext/ldap/ldap.c:2718 (#16392)

Browse source
This commit is contained in:
Niels Dossche 2024-10-12 13:19:23 +02:00 • committed by GitHub
parent 7fae9f7397
commit 497dbaa2df
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/ldap/ldap.c
View file

@ -2714,11 +2714,11 @@ PHP_FUNCTION(ldap_modify_batch)
ZEND_HASH_FOREACH_NUM_KEY_VAL(modifications, modification_index, modification_zv) {
ldap_mods[modification_index] = safe_emalloc(1, sizeof(LDAPMod), 0);
zval *attrib_zv = zend_hash_str_find(Z_ARRVAL_P(modification_zv), LDAP_MODIFY_BATCH_ATTRIB, strlen(LDAP_MODIFY_BATCH_ATTRIB));
zval *attrib_zv = zend_hash_str_find_deref(Z_ARRVAL_P(modification_zv), LDAP_MODIFY_BATCH_ATTRIB, strlen(LDAP_MODIFY_BATCH_ATTRIB));
ZEND_ASSERT(Z_TYPE_P(attrib_zv) == IS_STRING);
zval *modtype_zv = zend_hash_str_find(Z_ARRVAL_P(modification_zv), LDAP_MODIFY_BATCH_MODTYPE, strlen(LDAP_MODIFY_BATCH_MODTYPE));
zval *modtype_zv = zend_hash_str_find_deref(Z_ARRVAL_P(modification_zv), LDAP_MODIFY_BATCH_MODTYPE, strlen(LDAP_MODIFY_BATCH_MODTYPE));
ZEND_ASSERT(Z_TYPE_P(modtype_zv) == IS_LONG);
zval *modification_values = zend_hash_str_find(Z_ARRVAL_P(modification_zv), LDAP_MODIFY_BATCH_VALUES, strlen(LDAP_MODIFY_BATCH_VALUES));
zval *modification_values = zend_hash_str_find_deref(Z_ARRVAL_P(modification_zv), LDAP_MODIFY_BATCH_VALUES, strlen(LDAP_MODIFY_BATCH_VALUES));
ZEND_ASSERT(modification_values == NULL || Z_TYPE_P(modification_values) == IS_ARRAY);
/* map the modification type */

22
ext/ldap/tests/gh16389.phpt Normal file
View file

@ -0,0 +1,22 @@
--TEST--
GH-16389 (Assertion failure in ext/ldap/ldap.c:2718)
--EXTENSIONS--
ldap
--FILE--
<?php
$attrib = "attrib";
$modtype = LDAP_MODIFY_BATCH_ADD;
$values = ["value1"];
$ldap = ldap_connect('ldap://127.0.0.1:3333');
$modification_attrib_reference_string = [
[
"attrib" => &$attrib,
"modtype" => &$modtype,
"values" => &$values,
],
];
var_dump(ldap_modify_batch($ldap, "", $modification_attrib_reference_string));
?>
--EXPECTF--
Warning: ldap_modify_batch(): Batch Modify: Can't contact LDAP server in %s on line %d
bool(false)