mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-15 03:01:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix decoding of sasl bind and extended operation responses.

Browse Source
This commit is contained in:
Kurt Zeilenga 1999-12-12 03:16:46 +00:00
parent f3808cea66
commit c1a31ac9a2
2 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libraries/libldap/extended.c
View File

@ -189,8 +189,6 @@ ldap_parse_extended_result (
if( retoidp != NULL ) *retoidp = NULL; if( retoidp != NULL ) *retoidp = NULL;
if( retdatap != NULL ) *retdatap = NULL; if( retdatap != NULL ) *retdatap = NULL;
ber = ber_dup( res->lm_ber );
if ( ld->ld_error ) { if ( ld->ld_error ) {
LDAP_FREE( ld->ld_error ); LDAP_FREE( ld->ld_error );
ld->ld_error = NULL; ld->ld_error = NULL;
@ -201,6 +199,13 @@ ldap_parse_extended_result (
ld->ld_matched = NULL; ld->ld_matched = NULL;
} }
ber = ber_dup( res->lm_ber );
if ( ber == NULL ) {
ld->ld_errno = LDAP_NO_MEMORY;
return ld->ld_errno;
}
rc = ber_scanf( ber, "{iaa" /*}*/, &errcode, rc = ber_scanf( ber, "{iaa" /*}*/, &errcode,
&ld->ld_matched, &ld->ld_error ); &ld->ld_matched, &ld->ld_error );
@ -217,11 +222,13 @@ ldap_parse_extended_result (
if( tag == LDAP_TAG_REFERRAL ) { if( tag == LDAP_TAG_REFERRAL ) {
/* skip over referral */ /* skip over referral */
tag = ber_scanf( ber, "x" ); if( ber_scanf( ber, "x" ) == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR;
if( tag != LBER_ERROR ) { ber_free( ber, 0 );
tag = ber_peek_tag( ber, &len ); return ld->ld_errno;
} }
tag = ber_peek_tag( ber, &len );
} }
if( tag == LDAP_TAG_EXOP_RES_OID ) { if( tag == LDAP_TAG_EXOP_RES_OID ) {
@ -245,6 +252,8 @@ ldap_parse_extended_result (
} }
} }
ber_free( ber, 0 );
if( retoidp != NULL ) { if( retoidp != NULL ) {
*retoidp = resoid; *retoidp = resoid;
} else { } else {

55
libraries/libldap/sasl.c
View File

@ -264,7 +264,6 @@ ldap_parse_sasl_bind_result(
return ld->ld_errno; return ld->ld_errno;
} }
errcode = LDAP_SUCCESS;
scred = NULL; scred = NULL;
if ( ld->ld_error ) { if ( ld->ld_error ) {
@ -280,55 +279,69 @@ ldap_parse_sasl_bind_result(
ber = ber_dup( res->lm_ber ); ber = ber_dup( res->lm_ber );
if( ber == NULL ) {
ld->ld_errno = LDAP_NO_MEMORY;
return ld->ld_errno;
}
if ( ld->ld_version < LDAP_VERSION2 ) { if ( ld->ld_version < LDAP_VERSION2 ) {
tag = ber_scanf( ber, "{ia}", tag = ber_scanf( ber, "{ia}",
&errcode, &ld->ld_error ); &errcode, &ld->ld_error );
if( tag == LBER_ERROR ) {
ber_free( ber, 0 );
ld->ld_errno = LDAP_DECODING_ERROR;
return ld->ld_errno;
}
} else { } else {
ber_len_t len; ber_len_t len;
tag = ber_scanf( ber, "{iaa" /*}*/, tag = ber_scanf( ber, "{iaa" /*}*/,
&errcode, &ld->ld_matched, &ld->ld_error ); &errcode, &ld->ld_matched, &ld->ld_error );
if( tag != LBER_ERROR ) { if( tag == LBER_ERROR ) {
tag = ber_peek_tag(ber, &len); ber_free( ber, 0 );
ld->ld_errno = LDAP_DECODING_ERROR;
return ld->ld_errno;
} }
tag = ber_peek_tag(ber, &len);
if( tag == LDAP_TAG_REFERRAL ) { if( tag == LDAP_TAG_REFERRAL ) {
/* skip 'em */ /* skip 'em */
tag = ber_scanf( ber, "x" ); if( ber_scanf( ber, "x" ) == LBER_ERROR ) {
ber_free( ber, 0 );
ld->ld_errno = LDAP_DECODING_ERROR;
return ld->ld_errno;
}
if( tag != LBER_ERROR ) { tag = ber_peek_tag(ber, &len);
tag = ber_peek_tag(ber, &len); }
if( tag == LDAP_TAG_SASL_RES_CREDS ) {
if( ber_scanf( ber, "O", &scred ) == LBER_ERROR ) {
ber_free( ber, 0 );
ld->ld_errno = LDAP_DECODING_ERROR;
return ld->ld_errno;
} }
} }
/* need to clean out misc items */
if( tag == LDAP_TAG_SASL_RES_CREDS ) {
tag = ber_scanf( ber, "O", &scred );
}
} }
if ( tag == LBER_ERROR ) { ber_free( ber, 0 );
errcode = LDAP_DECODING_ERROR;
}
if( ber != NULL ) { if ( servercredp != NULL ) {
ber_free( ber, 0 );
}
/* return */
if ( errcode == LDAP_SUCCESS && servercredp != NULL ) {
*servercredp = scred; *servercredp = scred;
} else if ( scred != NULL ) { } else if ( scred != NULL ) {
ber_bvfree( scred ); ber_bvfree( scred );
} }
ld->ld_errno = errcode;
if ( freeit ) { if ( freeit ) {
ldap_msgfree( res ); ldap_msgfree( res );
} }
ld->ld_errno = errcode;
return( ld->ld_errno ); return( ld->ld_errno );
} }