upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#8733 Allow a raw integer to be decoded from a berval

Browse source
This commit is contained in:
Hallvard Furuseth 2017-06-23 10:56:49 +01:00 committed by Ondřej Kuzník
parent 62811e8f65
commit ff2d7cc798
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/lber.h
View file

@ -280,6 +280,11 @@ ber_get_enum LDAP_P((
BerElement *ber, BerElement *ber,
ber_int_t *num )); ber_int_t *num ));
LBER_F( int )
ber_decode_int LDAP_P((
const struct berval *bv,
ber_int_t *num ));
LBER_F( ber_tag_t ) LBER_F( ber_tag_t )
ber_get_stringb LDAP_P(( ber_get_stringb LDAP_P((
BerElement *ber, BerElement *ber,

27
libraries/liblber/decode.c
View file

@ -283,21 +283,28 @@ ber_get_int(
BerElement *ber, BerElement *ber,
ber_int_t *num ) ber_int_t *num )
{ {
ber_tag_t tag;
ber_len_t len;
struct berval bv; struct berval bv;
ber_tag_t tag = ber_skip_element( ber, &bv );
if ( tag == LBER_DEFAULT ) {
return tag;
}
return ber_decode_int( &bv, num ) ? LBER_DEFAULT : tag;
}
int
ber_decode_int( const struct berval *bv, ber_int_t *num )
{
ber_len_t len = bv->bv_len;
if ( len > sizeof(ber_int_t) )
return -1;
assert( num != NULL ); assert( num != NULL );
tag = ber_skip_element( ber, &bv );
len = bv.bv_len;
if ( tag == LBER_DEFAULT || len > sizeof(ber_int_t) ) {
return LBER_DEFAULT;
}
/* parse two's complement integer */ /* parse two's complement integer */
if( len ) { if( len ) {
unsigned char *buf = (unsigned char *) bv.bv_val; unsigned char *buf = (unsigned char *) bv->bv_val;
ber_len_t i; ber_len_t i;
ber_int_t netnum = buf[0] & 0xff; ber_int_t netnum = buf[0] & 0xff;
@ -315,7 +322,7 @@ ber_get_int(
*num = 0; *num = 0;
} }
return tag; return 0;
} }
ber_tag_t ber_tag_t