libraries/liblber/decode.c - diff

Return to decode.c CVS log

Up to [OpenLDAP] / libraries / liblber

Diff for /libraries/liblber/decode.c between versions 1.109 and 1.110

version 1.109, 2007/04/04 15:51:10	version 1.110, 2007/07/23 10:57:23
Line 1	Line 1
/* decode.c - ber input decoding routines */	/* decode.c - ber input decoding routines */
/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.108 2007/03/23 14:27:38 hyc Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.109 2007/04/04 15:51:10 hallvard Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*	*
* Copyright 1998-2007 The OpenLDAP Foundation.	* Copyright 1998-2007 The OpenLDAP Foundation.
Line 49 static ber_len_t ber_getnint LDAP_P((	Line 49 static ber_len_t ber_getnint LDAP_P((
int	int
ber_decode_oid( BerValue in, BerValue out )	ber_decode_oid( BerValue in, BerValue out )
{	{
unsigned char der = (unsigned char ) in->bv_val;	const unsigned char *der;
unsigned long val, val1;	unsigned long val;
int i, len;	unsigned val1;
	ber_len_t i;
char *ptr;	char *ptr;

assert( in != NULL );	assert( in != NULL );
assert( out != NULL );	assert( out != NULL );

/* expands by 5/2, and we add dots - call it 3 */	/* need 4 chars/inbyte + \0 for input={7f 7f 7f...} */
if ( !out->bv_val \|\| out->bv_len < in->bv_len * 3 )	if ( !out->bv_val \|\| (out->bv_len+3)/4 <= in->bv_len )
return -1;	return -1;

val1 = der[0] / 40;	ptr = NULL;
val = der[0] - val1 * 40;	der = (unsigned char *) in->bv_val;

len = sprintf( out->bv_val, "%ld.%ld", val1, val );
ptr = out->bv_val + len;
val = 0;	val = 0;
for ( i=1; i<in->bv_len; i++ ) {	for ( i=0; i < in->bv_len; i++ ) {
val = val << 7;
val \|= der[i] & 0x7f;	val \|= der[i] & 0x7f;
if ( !( der[i] & 0x80 )) {	if ( !( der[i] & 0x80 )) {
ptr += sprintf( ptr, ".%ld", val );	if ( ptr == NULL ) {
	/* Initial "x.y": val=x40+y, x<=2, y<40 if x=2 /
	ptr = out->bv_val;
	val1 = (val < 80 ? val/40 : 2);
	val -= val1*40;
	ptr += sprintf( ptr, "%u", val1 );
	}
	ptr += sprintf( ptr, ".%lu", val );
val = 0;	val = 0;
	} else if ( val - 1UL < LBER_OID_COMPONENT_MAX >> 7 ) {
	val <<= 7;
	} else {
	/* val would overflow, or is 0 from invalid initial 0x80 octet */
	return -1;
}	}
}	}
	if ( ptr == NULL \|\| val != 0 )
	return -1;

out->bv_len = ptr - out->bv_val;	out->bv_len = ptr - out->bv_val;
return 0;	return 0;
}	}

Removed from v.1.109
changed lines
	Added in v.1.110