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

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  Updated NEWS
  Fix a NULL dereferencing crash in php-ldap
This commit is contained in:
Côme Chilliet
2019-04-15 10:21:27 +02:00
parent 426f99126e f31435b855
commit 9d38510ab4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/ldap/ldap.c
+3 -1
View File
@@ -260,7 +260,9 @@ static void _php_ldap_control_to_array(LDAP *ld, LDAPControl* ctrl, zval* array,
add_assoc_long(&value, "target", target);
add_assoc_long(&value, "count", count);
add_assoc_long(&value, "errcode", errcode);
add_assoc_stringl(&value, "context", context->bv_val, context->bv_len);
if ( context && (context->bv_len >= 0) ) {
add_assoc_stringl(&value, "context", context->bv_val, context->bv_len);
}
add_assoc_zval(array, "value", &value);
} else {
add_assoc_null(array, "value");