iliaa Mon Oct 6 20:36:27 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/ldap ldap.c
Log:
MFH: Cleaned up previous patch.
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.130.2.8 php-src/ext/ldap/ldap.c:1.130.2.9
--- php-src/ext/ldap/ldap.c:1.130.2.8 Mon Oct 6 19:34:16 2003
+++ php-src/ext/ldap/ldap.c Mon Oct 6 20:36:27 2003
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.130.2.8 2003/10/06 23:34:16 sniper Exp $ */
+/* $Id: ldap.c,v 1.130.2.9 2003/10/07 00:36:27 iliaa Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -286,7 +286,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.130.2.8 2003/10/06
23:34:16 sniper Exp $" );
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.130.2.9 2003/10/07
00:36:27 iliaa Exp $" );
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -1615,18 +1615,15 @@
{
char *val = NULL;
- if (ldap_get_option(ld->link, opt, &val)) {
- RETURN_FALSE;
- }
- if (val != NULL) {
- if (*val != '\0') {
- zval_dtor(*retval);
- ZVAL_STRING(*retval, val, 1);
+ if (ldap_get_option(ld->link, opt, &val) || val == NULL ||
*val == '\0') {
+ if (val) {
+ ldap_memfree(val);
}
- ldap_memfree(val);
- } else {
RETURN_FALSE;
}
+ zval_dtor(*retval);
+ ZVAL_STRING(*retval, val, 1);
+ ldap_memfree(val);
} break;
/* options not implemented
case LDAP_OPT_SERVER_CONTROLS:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
