archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Fixed bug #48696 (ldap_read() segfaults with invalid parameters)

Browse source
This commit is contained in:
Felipe Pena 2009-06-25 14:48:53 +00:00
parent ac88f10ea0
commit a27158a76c
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/ldap/ldap.c
View file

@ -600,7 +600,7 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
char *ldap_base_dn = NULL;
char *ldap_filter = NULL;
char **ldap_attrs = NULL;
ldap_linkdata *ld;
ldap_linkdata *ld = NULL;
LDAPMessage *ldap_res;
int ldap_attrsonly = 0;
int ldap_sizelimit = -1;
@ -817,8 +817,10 @@ cleanup_parallel:
}
cleanup:
// Restoring previous options
php_set_opts(ld->link, old_ldap_sizelimit, old_ldap_timelimit, old_ldap_deref, &ldap_sizelimit, &ldap_timelimit, &ldap_deref);
if (ld) {
/* Restoring previous options */
php_set_opts(ld->link, old_ldap_sizelimit, old_ldap_timelimit, old_ldap_deref, &ldap_sizelimit, &ldap_timelimit, &ldap_deref);
}
if (ldap_attrs != NULL) {
efree(ldap_attrs);
}