Commit e4054ba2 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5304

parent 3d39ff68
...@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log ...@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
OpenLDAP 2.4.8 Engineering OpenLDAP 2.4.8 Engineering
Fixed ldapmodify verbose logging (ITS#5247) Fixed ldapmodify verbose logging (ITS#5247)
Fixed libldap extended decoding (ITS#5304)
Fixed libldap filter abort (ITS#5300) Fixed libldap filter abort (ITS#5300)
Fixed libldap ldap_parse_sasl_bind_result (ITS#5263) Fixed libldap ldap_parse_sasl_bind_result (ITS#5263)
Fixed libldap search timeout crash (ITS#5291) Fixed libldap search timeout crash (ITS#5291)
......
...@@ -291,7 +291,6 @@ ldap_parse_intermediate ( ...@@ -291,7 +291,6 @@ ldap_parse_intermediate (
int freeit ) int freeit )
{ {
BerElement *ber; BerElement *ber;
ber_tag_t rc;
ber_tag_t tag; ber_tag_t tag;
ber_len_t len; ber_len_t len;
struct berval *resdata; struct berval *resdata;
...@@ -324,9 +323,9 @@ ldap_parse_intermediate ( ...@@ -324,9 +323,9 @@ ldap_parse_intermediate (
return ld->ld_errno; return ld->ld_errno;
} }
rc = ber_scanf( ber, "{" /*}*/ ); tag = ber_scanf( ber, "{" /*}*/ );
if( rc == LBER_ERROR ) { if( tag == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR; ld->ld_errno = LDAP_DECODING_ERROR;
ber_free( ber, 0 ); ber_free( ber, 0 );
return ld->ld_errno; return ld->ld_errno;
...@@ -367,16 +366,16 @@ ldap_parse_intermediate ( ...@@ -367,16 +366,16 @@ ldap_parse_intermediate (
} }
if ( serverctrls == NULL ) { if ( serverctrls == NULL ) {
rc = LDAP_SUCCESS; ld->ld_errno = LDAP_SUCCESS;
goto free_and_return; goto free_and_return;
} }
if ( ber_scanf( ber, /*{*/ "}" ) == LBER_ERROR ) { if ( ber_scanf( ber, /*{*/ "}" ) == LBER_ERROR ) {
rc = LDAP_DECODING_ERROR; ld->ld_errno = LDAP_DECODING_ERROR;
goto free_and_return; goto free_and_return;
} }
rc = ldap_pvt_get_controls( ber, serverctrls ); ld->ld_errno = ldap_pvt_get_controls( ber, serverctrls );
free_and_return: free_and_return:
ber_free( ber, 0 ); ber_free( ber, 0 );
...@@ -397,6 +396,6 @@ free_and_return: ...@@ -397,6 +396,6 @@ free_and_return:
ldap_msgfree( res ); ldap_msgfree( res );
} }
return LDAP_SUCCESS; return ld->ld_errno;
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment