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

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  ldap: Fix memory leak in ldap_set_options()
This commit is contained in:
Niels Dossche
2025-12-08 22:30:16 +01:00
parent 61eca669d9 02a7c49564
commit 5da5fa5528
3 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -13,7 +13,9 @@ PHP NEWS
- GD:
. Fixed bug GH-20622 (imagestring/imagestringup overflow). (David Carlier)
- LDAP:
. Fix memory leak in ldap_set_options(). (ndossche)
18 Dec 2025, PHP 8.4.16
- Core:

10
ext/ldap/ldap.c
View File

@@ -663,14 +663,15 @@ static int _php_ldap_control_from_array(LDAP *ld, LDAPControl** ctrl, zval* arra
goto failure;
}
zend_string *context_str = NULL;
if ((tmp = zend_hash_str_find(Z_ARRVAL_P(val), "context", sizeof("context") - 1)) != NULL) {
tmpstring = zval_get_string(tmp);
context_str = zval_get_string(tmp);
if (EG(exception)) {
rc = -1;
goto failure;
}
context.bv_val = ZSTR_VAL(tmpstring);
context.bv_len = ZSTR_LEN(tmpstring);
context.bv_val = ZSTR_VAL(context_str);
context.bv_len = ZSTR_LEN(context_str);
vlvInfo.ldvlv_context = &context;
} else {
vlvInfo.ldvlv_context = NULL;
@@ -682,6 +683,9 @@ static int _php_ldap_control_from_array(LDAP *ld, LDAPControl** ctrl, zval* arra
if (rc != LDAP_SUCCESS) {
php_error_docref(NULL, E_WARNING, "Failed to create VLV control value: %s (%d)", ldap_err2string(rc), rc);
}
if (context_str) {
zend_string_release_ex(context_str, false);
}
} else {
zend_type_error("%s(): Control OID %s cannot be of type array", get_active_function_name(), ZSTR_VAL(control_oid));
rc = -1;

34
ext/ldap/tests/ldap_set_option_leak_attrvalue_context.phpt Normal file
View File

@@ -0,0 +1,34 @@
--TEST--
ldap_set_option() - Leaks attrvalue and context
--EXTENSIONS--
ldap
--FILE--
<?php
require "connect.inc";
$link = ldap_connect($uri);
$attrvalue = str_repeat("attrvalue", random_int(1, 1));
$context = str_repeat("context", random_int(1, 1));
$controls = [
["oid" => "2.16.840.1.113730.3.4.9", "value" => ["attrvalue" => $attrvalue, "context" => $context, "before" => 0, "after" => 0]],
];
ldap_set_option($link, LDAP_OPT_CLIENT_CONTROLS, $controls);
ldap_get_option($link, LDAP_OPT_CLIENT_CONTROLS, $controls_out);
var_dump($controls_out);
?>
--EXPECTF--
array(1) {
["2.16.840.1.113730.3.4.9"]=>
array(3) {
["oid"]=>
string(23) "2.16.840.1.113730.3.4.9"
["iscritical"]=>
bool(false)
["value"]=>
string(28) "0%0%0<> attrvaluecontext"
}
}