mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix strval2strlen end-of-string check. Otherwise passing in a string

Browse Source 
without string[len] == '\0' causes assert in ldap_dn2bv_x.
This commit is contained in:
Howard Chu 2006-11-08 23:57:02 +00:00
parent d3dc069a62
commit 961f0ba113
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/libldap/getdn.c
View File

@ -2016,7 +2016,7 @@ static int
strval2strlen( struct berval *val, unsigned flags, ber_len_t *len ) strval2strlen( struct berval *val, unsigned flags, ber_len_t *len )
{ {
ber_len_t l, cl = 1; ber_len_t l, cl = 1;
char *p; char *p, *end;
int escaped_byte_len = LDAP_DN_IS_PRETTY( flags ) ? 1 : 3; int escaped_byte_len = LDAP_DN_IS_PRETTY( flags ) ? 1 : 3;
#ifdef PRETTY_ESCAPE #ifdef PRETTY_ESCAPE
int escaped_ascii_len = LDAP_DN_IS_PRETTY( flags ) ? 2 : 3; int escaped_ascii_len = LDAP_DN_IS_PRETTY( flags ) ? 2 : 3;
@ -2030,7 +2030,8 @@ strval2strlen( struct berval *val, unsigned flags, ber_len_t *len )
return( 0 ); return( 0 );
} }
for ( l = 0, p = val->bv_val; p < val->bv_val + val->bv_len; p += cl ) { end = val->bv_val + val->bv_len - 1;
for ( l = 0, p = val->bv_val; p <= end; p += cl ) {
/* /*
* escape '%x00' * escape '%x00'
@ -2059,7 +2060,7 @@ strval2strlen( struct berval *val, unsigned flags, ber_len_t *len )
} else if ( LDAP_DN_NEEDESCAPE( p[ 0 ] ) } else if ( LDAP_DN_NEEDESCAPE( p[ 0 ] )
|| LDAP_DN_SHOULDESCAPE( p[ 0 ] ) || LDAP_DN_SHOULDESCAPE( p[ 0 ] )
|| ( p == val->bv_val && LDAP_DN_NEEDESCAPE_LEAD( p[ 0 ] ) ) || ( p == val->bv_val && LDAP_DN_NEEDESCAPE_LEAD( p[ 0 ] ) )
|| ( !p[ 1 ] && LDAP_DN_NEEDESCAPE_TRAIL( p[ 0 ] ) ) ) { || ( p == end && LDAP_DN_NEEDESCAPE_TRAIL( p[ 0 ] ) ) ) {
#ifdef PRETTY_ESCAPE #ifdef PRETTY_ESCAPE
#if 0 #if 0
if ( LDAP_DN_WILLESCAPE_HEX( flags, p[ 0 ] ) ) { if ( LDAP_DN_WILLESCAPE_HEX( flags, p[ 0 ] ) ) {