CVS update: php3/functions
| From: | rasmus | Date: | Sun, 08 Nov 1998 14:51:10 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-2283@lists.php.net to get a copy of this message | ||
Date: Sunday November 8, 1998 @ 9:51
Author: rasmus
Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv21721/functions
Modified Files:
ldap.c
Log Message:
Results were getting free'ed twice when ldap_free_result() was called which
caused a core dump.
Index: php3/functions/ldap.c
diff -c php3/functions/ldap.c:1.60 php3/functions/ldap.c:1.61
*** php3/functions/ldap.c:1.60 Sat Nov 7 11:59:21 1998
--- php3/functions/ldap.c Sun Nov 8 09:51:09 1998
***************
*** 30,36 ****
*/
! /* $Id: ldap.c,v 1.60 1998/11/07 16:59:21 rasmus Exp $ */
#define IS_EXT_MODULE
#if !PHP_31 && defined(THREAD_SAFE)
#undef THREAD_SAFE
--- 30,36 ----
*/
! /* $Id: ldap.c,v 1.61 1998/11/08 14:51:09 rasmus Exp $ */
#define IS_EXT_MODULE
#if !PHP_31 && defined(THREAD_SAFE)
#undef THREAD_SAFE
***************
*** 305,311 ****
php3_printf("<table>"
"<tr><td>Total links:</td><td>%d/%s</td></tr>\n"
! "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.60 1998/11/07
16:59:21 rasmus Exp $</td></tr>\n"
#if HAVE_NSLDAP
"<tr><td>SDK Version:</td><td>%f</td></tr>"
"<tr><td>Highest LDAP Protocol
Supported:</td><td>%f</td></tr>"
--- 305,311 ----
php3_printf("<table>"
"<tr><td>Total links:</td><td>%d/%s</td></tr>\n"
! "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.61 1998/11/08
14:51:09 rasmus Exp $</td></tr>\n"
#if HAVE_NSLDAP
"<tr><td>SDK Version:</td><td>%f</td></tr>"
"<tr><td>Highest LDAP Protocol
Supported:</td><td>%f</td></tr>"
***************
*** 478,484 ****
pval *berp;
if ( getParameters(ht,1,&berp) == FAILURE ) RETURN_FALSE;
- /*_free_ber_entry(_get_ber_entry(berp,list));*/
php3_list_delete(berp->value.lval);
RETURN_TRUE;
--- 478,483 ----
***************
*** 556,562 ****
ldap = _get_ldap_link(link, list);
if (ldap == NULL) RETURN_FALSE;
- /* dont do _close_ldap_link(ldap);*/
php3_list_delete(link->value.lval);
RETURN_TRUE;
} /* }}} */
--- 555,560 ----
***************
*** 698,705 ****
if (ldap_result == NULL) {
RETVAL_FALSE;
} else {
! _free_ldap_result(ldap_result);
! php3_list_delete(result->value.lval);
RETVAL_TRUE;
}
return;
--- 696,702 ----
if (ldap_result == NULL) {
RETVAL_FALSE;
} else {
! php3_list_delete(result->value.lval); /* Delete list entry and call registered destructor
function */
RETVAL_TRUE;
}
return;
***************
*** 775,781 ****
if ((ldap_result_entry_next = ldap_next_entry(ldap, ldap_result_entry)) == NULL) {
RETURN_FALSE;
} else {
- /* php3_list_delete(result->value.lval); */
RETURN_LONG(php3_list_insert(ldap_result_entry_next, LDAP_GLOBAL(le_result_entry)));
}
} /* }}} */
--- 772,777 ----
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net