cvs: php4 /ext/ldap ldap.c

sniper Fri Jul 28 15:39:22 2000 EDT Modified files: /php4/ext/ldap ldap.c Log: Fixes bug which caused crash, if result_entry wasn't valid. Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.55 php4/ext/ldap/ldap.c:1.56 --- php4/ext/ldap/ldap.c:1.55 Fri Jul 28 14:48:16 2000 +++ php4/ext/ldap/ldap.c Fri Jul 28 15:39:22 2000 @@ -22,7 +22,7 @@ */ -/* $Id: ldap.c,v 1.55 2000/07/28 21:48:16 sniper Exp $ */ +/* $Id: ldap.c,v 1.56 2000/07/28 22:39:22 sniper Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -186,7 +186,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled" ); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.55 2000/07/28 21:48:16 sniper Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.56 2000/07/28 22:39:22 sniper Exp $" ); php_info_print_table_row(2, "Total Links", maxl ); #if HAVE_NSLDAP @@ -978,11 +978,12 @@ WRONG_PARAM_COUNT; } - if ((ldap = _get_ldap_link(link)) == NULL) { - RETURN_FALSE; - } - + ldap = _get_ldap_link(link); + if (ldap == NULL) RETURN_FALSE; + ldap_result_entry = _get_ldap_result_entry(result_entry); + if (ldap_result_entry == NULL) RETURN_FALSE; + convert_to_string_ex(attr); attribute = (*attr)->value.str.val;