From 1701a9e22f6769eaf7b795fe527487de2da06856 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Sat, 7 Aug 1999 16:32:50 +0000 Subject: [PATCH] Fix for bug #1980 --- ChangeLog | 1 + ext/ldap/ldap.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c3cc37d2a..e5c730f4dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ PHP 4.0 CHANGE LOG ChangeLog ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ??? ?? 1999, Version 4.0 Beta 2 +- Fixed ldap_search(), ldap_read() and ldap_list() (Zeev) - Fixed Apache information in phpinfo() (sam@breakfree.com) - Improved register_shutdown_function() - you may now supply arguments that will be passed to the shutdown function (Zeev) diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 22664840ab..f3d8db5af1 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -537,7 +537,7 @@ PHP_FUNCTION(ldap_unbind) static void php3_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) { - pval *link, *base_dn, *filter, *attrs, *attr; + pval *link, *base_dn, *filter, *attrs, **attr; char *ldap_base_dn, *ldap_filter; LDAP *ldap; char **ldap_attrs = NULL; @@ -589,8 +589,9 @@ static void php3_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) RETURN_FALSE; return; } - convert_to_string(attr); - ldap_attrs[i] = attr->value.str.val; + SEPARATE_ZVAL(attr); + convert_to_string(*attr); + ldap_attrs[i] = (*attr)->value.str.val; } ldap_attrs[num_attribs] = NULL; -- 2.40.0