libraries/liblber/decode.c - diff

Return to decode.c CVS log

Up to [OpenLDAP] / libraries / liblber

version 1.105.2.9, 2009/10/31 00:13:00	version 1.105.2.10, 2009/11/04 16:08:50
Line 481 ber_get_stringbv( BerElement *ber, struc	Line 481 ber_get_stringbv( BerElement *ber, struc

tag = ber_skip_element( ber, bv );	tag = ber_skip_element( ber, bv );
if ( tag == LBER_DEFAULT \|\|	if ( tag == LBER_DEFAULT \|\|
(( option & LBER_BV_STRING ) && memchr( bv->bv_val, 0, bv->bv_len )))	(( option & LBER_BV_STRING ) &&
	bv->bv_len && memchr( bv->bv_val, 0, bv->bv_len - 1 )))
{	{
bv->bv_val = NULL;	bv->bv_val = NULL;
return LBER_DEFAULT;	return LBER_DEFAULT;
Line 518 ber_get_stringbv_null( BerElement *ber,	Line 519 ber_get_stringbv_null( BerElement *ber,
return tag;	return tag;
}	}

if (( option & LBER_BV_STRING ) && memchr( bv->bv_val, 0, bv->bv_len )) {	if (( option & LBER_BV_STRING ) &&
	memchr( bv->bv_val, 0, bv->bv_len - 1 ))
	{
bv->bv_val = NULL;	bv->bv_val = NULL;
return LBER_DEFAULT;	return LBER_DEFAULT;
}	}