File php-CVE-2018-10548.patch of Package php7.24160
X-Git-Url: http://208.43.231.11:8000/?p=php-src.git;a=blobdiff_plain;f=ext%2Fldap%2Fldap.c;h=03ca03d3adee59787d58cd342d8f864c5d96252a;hp=8ab0fe072786e6f8d7dbd47b6a4897e81ce89ec3;hb=49782c54994ecca2ef2a061063bd5a7079c43527;hpb=cb981e39c29bda59897cfaf30cebbf534c27f47c
Index: php-7.0.7/ext/ldap/ldap.c
===================================================================
--- php-7.0.7.orig/ext/ldap/ldap.c 2018-05-04 09:19:34.931962243 +0200
+++ php-7.0.7/ext/ldap/ldap.c 2018-05-04 09:20:57.585121390 +0200
@@ -1120,7 +1120,11 @@ PHP_FUNCTION(ldap_get_entries)
add_assoc_long(&tmp1, "count", num_attrib);
dn = ldap_get_dn(ldap, ldap_result_entry);
- add_assoc_string(&tmp1, "dn", dn);
+ if (dn) {
+ add_assoc_string(&tmp1, "dn", dn);
+ } else {
+ add_assoc_null(&tmp1, "dn");
+ }
#if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP || WINDOWS
ldap_memfree(dn);
#else