Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 154349
Collapse All | Expand All

(-)libraries/libldap/getdn.c (-3 / +4 lines)
Lines 2016-2022 Link Here
2016
strval2strlen( struct berval *val, unsigned flags, ber_len_t *len )
2016
strval2strlen( struct berval *val, unsigned flags, ber_len_t *len )
2017
{
2017
{
2018
	ber_len_t	l, cl = 1;
2018
	ber_len_t	l, cl = 1;
2019
	char		*p;
2019
	char		*p, *end;
2020
	int		escaped_byte_len = LDAP_DN_IS_PRETTY( flags ) ? 1 : 3;
2020
	int		escaped_byte_len = LDAP_DN_IS_PRETTY( flags ) ? 1 : 3;
2021
#ifdef PRETTY_ESCAPE
2021
#ifdef PRETTY_ESCAPE
2022
	int		escaped_ascii_len = LDAP_DN_IS_PRETTY( flags ) ? 2 : 3;
2022
	int		escaped_ascii_len = LDAP_DN_IS_PRETTY( flags ) ? 2 : 3;
Lines 2030-2036 Link Here
2030
		return( 0 );
2030
		return( 0 );
2031
	}
2031
	}
2032
2032
2033
	for ( l = 0, p = val->bv_val; p < val->bv_val + val->bv_len; p += cl ) {
2033
	end = val->bv_val + val->bv_len - 1;
2034
	for ( l = 0, p = val->bv_val; p <= end; p += cl ) {
2034
2035
2035
		/* 
2036
		/* 
2036
		 * escape '%x00' 
2037
		 * escape '%x00' 
Lines 2059-2065 Link Here
2059
		} else if ( LDAP_DN_NEEDESCAPE( p[ 0 ] )
2060
		} else if ( LDAP_DN_NEEDESCAPE( p[ 0 ] )
2060
				|| LDAP_DN_SHOULDESCAPE( p[ 0 ] )
2061
				|| LDAP_DN_SHOULDESCAPE( p[ 0 ] )
2061
				|| ( p == val->bv_val && LDAP_DN_NEEDESCAPE_LEAD( p[ 0 ] ) )
2062
				|| ( p == val->bv_val && LDAP_DN_NEEDESCAPE_LEAD( p[ 0 ] ) )
2062
				|| ( !p[ 1 ] && LDAP_DN_NEEDESCAPE_TRAIL( p[ 0 ] ) ) ) {
2063
				|| ( p == end && LDAP_DN_NEEDESCAPE_TRAIL( p[ 0 ] ) ) ) {
2063
#ifdef PRETTY_ESCAPE
2064
#ifdef PRETTY_ESCAPE
2064
#if 0
2065
#if 0
2065
			if ( LDAP_DN_WILLESCAPE_HEX( flags, p[ 0 ] ) ) {
2066
			if ( LDAP_DN_WILLESCAPE_HEX( flags, p[ 0 ] ) ) {

Return to bug 154349