mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

partially addresses an issue with ITS#5931

Browse Source
This commit is contained in:
Pierangelo Masarati 2009-02-10 12:44:12 +00:00
parent cb7575d244
commit 2b95e7d288
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/liblber/decode.c
View File

@ -143,13 +143,14 @@ ber_skip_tag( BerElement *ber, ber_len_t *len )
{
ber_tag_t tag;
unsigned char lc;
ber_len_t i, noctets;
unsigned char netlen[sizeof(ber_len_t)];
char *save;
assert( ber != NULL );
assert( len != NULL );
assert( LBER_VALID( ber ) );
save = ber->ber_ptr;
/*
* Any ber element looks like this: tag length contents.
* Assuming everything's ok, we return the tag byte (we
@ -182,6 +183,9 @@ ber_skip_tag( BerElement *ber, ber_len_t *len )
}
if ( lc & 0x80U ) {
ber_len_t i, noctets;
unsigned char netlen[sizeof(ber_len_t)];
noctets = (lc & 0x7fU);
if ( noctets > sizeof(ber_len_t) ) {
@ -202,7 +206,7 @@ ber_skip_tag( BerElement *ber, ber_len_t *len )
}
/* BER element should have enough data left */
if( *len > (ber_len_t) ber_pvt_ber_remaining( ber ) ) {
if( *len > (ber_len_t) (ber_pvt_ber_remaining( ber ) + ber->ber_ptr - save) ) {
return LBER_DEFAULT;
}
ber->ber_tag = *(unsigned char *)ber->ber_ptr;