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

Clean up build_result_ber error handling.

Browse Source
This commit is contained in:
Kurt Zeilenga 1999-06-11 18:48:34 +00:00
parent 041c7971c4
commit 2cb228a9ce
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/libldap/result.c
View File

@ -540,9 +540,11 @@ build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr )
long along; long along;
BerElement *ber; BerElement *ber;
ber = *bp = ldap_alloc_ber_with_options( ld ); *bp = NULL;
ber = ldap_alloc_ber_with_options( ld );
if( ber == NULL ) { if( ber == NULL ) {
ld->ld_errno = LDAP_NO_MEMORY;
return LBER_ERROR; return LBER_ERROR;
} }
@ -552,6 +554,7 @@ build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr )
lr->lr_res_error ? lr->lr_res_error : "" ) == -1 ) { lr->lr_res_error ? lr->lr_res_error : "" ) == -1 ) {
ld->ld_errno = LDAP_ENCODING_ERROR; ld->ld_errno = LDAP_ENCODING_ERROR;
ber_free(ber, 1);
return( LBER_ERROR ); return( LBER_ERROR );
} }
@ -559,11 +562,13 @@ build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr )
if ( ber_skip_tag( ber, &len ) == LBER_ERROR ) { if ( ber_skip_tag( ber, &len ) == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR; ld->ld_errno = LDAP_DECODING_ERROR;
ber_free(ber, 1);
return( LBER_ERROR ); return( LBER_ERROR );
} }
if ( ber_get_int( ber, &along ) == LBER_ERROR ) { if ( ber_get_int( ber, &along ) == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR; ld->ld_errno = LDAP_DECODING_ERROR;
ber_free(ber, 1);
return( LBER_ERROR ); return( LBER_ERROR );
} }
@ -571,9 +576,11 @@ build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr )
if ( tag == LBER_ERROR ) { if ( tag == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR; ld->ld_errno = LDAP_DECODING_ERROR;
ber_free(ber, 1);
return( LBER_ERROR ); return( LBER_ERROR );
} }
*bp = ber;
return tag; return tag;
} }