mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Import stringal change to return {NULL,0} when len is 0

Browse Source
This commit is contained in:
Kurt Zeilenga 2000-10-02 19:26:31 +00:00
parent 33d559b6c8
commit 93157a9ef0
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libraries/liblber/decode.c
View File

@ -297,23 +297,33 @@ ber_get_stringal( BerElement *ber, struct berval **bv )
if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
*bv = NULL;
return( LBER_DEFAULT );
return LBER_DEFAULT;
}
if ( (*bv = (struct berval *) LBER_MALLOC( sizeof(struct berval) )) == NULL )
return( LBER_DEFAULT );
*bv = (struct berval *) LBER_MALLOC( sizeof(struct berval) );
if ( *bv == NULL ) {
return LBER_DEFAULT;
}
if ( ((*bv)->bv_val = (char *) LBER_MALLOC( len + 1 )) == NULL ) {
if( len == 0 ) {
(*bv)->bv_val = NULL;
(*bv)->bv_len = 0;
return tag;
}
(*bv)->bv_val = (char *) LBER_MALLOC( len + 1 );
if ( (*bv)->bv_val == NULL ) {
LBER_FREE( *bv );
*bv = NULL;
return( LBER_DEFAULT );
return LBER_DEFAULT;
}
if ( (ber_len_t) ber_read( ber, (*bv)->bv_val, len ) != len ) {
ber_bvfree( *bv );
*bv = NULL;
return( LBER_DEFAULT );
return LBER_DEFAULT;
}
((*bv)->bv_val)[len] = '\0';
(*bv)->bv_len = len;