cvs: php4 /ext/ldap ldap.c

sniper Thu Jul 27 17:09:34 2000 EDT Modified files: /php4/ext/ldap ldap.c Log: @- Fixed bug in ldap_get_values_len() which makes it NULL-safe. (Jani) @ Bug-report and fix submitted by Michel Alexeline <alexel@dr15.cnrs.fr> # Plus I added missing ldap_value_free_len(). Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.52 php4/ext/ldap/ldap.c:1.53 --- php4/ext/ldap/ldap.c:1.52 Wed Jul 26 04:28:14 2000 +++ php4/ext/ldap/ldap.c Thu Jul 27 17:09:33 2000 @@ -22,7 +22,7 @@ */ -/* $Id: ldap.c,v 1.52 2000/07/26 11:28:14 eschmid Exp $ */ +/* $Id: ldap.c,v 1.53 2000/07/28 00:09:33 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.52 2000/07/26 11:28:14 eschmid Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.53 2000/07/28 00:09:33 sniper Exp $" ); php_info_print_table_row(2, "Total Links", maxl ); #if HAVE_NSLDAP @@ -957,14 +957,14 @@ } add_assoc_long(return_value, "count", num_values); - ldap_value_free(ldap_value); + } /* }}} */ /* {{{ proto array ldap_get_values_len(int link, int result, string attribute) - Get the lengths for all values from a result entry */ + Get all values with lengths from a result entry */ PHP_FUNCTION(ldap_get_values_len) { pval **link, **result_entry, **attr; @@ -974,8 +974,7 @@ struct berval **ldap_value_len; int i, num_values; - if (ZEND_NUM_ARGS() != 3 || - zend_get_parameters_ex(3, &link, &result_entry, &attr) == FAILURE) { + if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &link, &result_entry, &attr) == FAILURE) { WRONG_PARAM_COUNT; } @@ -1007,10 +1006,12 @@ } for (i=0; i<num_values; i++) { - add_next_index_string(return_value, ldap_value_len[i]->bv_val, 1); + add_next_index_stringl(return_value, ldap_value_len[i]->bv_val, ldap_value_len[i]->bv_len, 1); } add_assoc_long(return_value, "count", num_values); + ldap_value_free_len(ldap_value_len); + } /* }}} */