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

Omit leading zero pad byte

Browse Source
This commit is contained in:
Howard Chu 2007-12-01 11:41:52 +00:00
parent d4baa7dc87
commit 95993844dd
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
servers/slapd/schema_init.c
View File

@ -2119,30 +2119,38 @@ integerVal2Key(
struct berval *tmp struct berval *tmp
) )
{ {
struct berval iv;
int neg; int neg;
if ( lutil_str2bin( val, tmp )) { iv = *tmp;
if ( lutil_str2bin( val, &iv )) {
return LDAP_INVALID_SYNTAX; return LDAP_INVALID_SYNTAX;
} }
neg = tmp->bv_val[0] & 0x80; neg = iv.bv_val[0] & 0x80;
/* Omit leading 0 pad byte */
if ( !iv.bv_val[0] ) {
iv.bv_val++;
iv.bv_len--;
}
/* If too small, sign-extend */ /* If too small, sign-extend */
if ( tmp->bv_len < index_intlen ) { if ( iv.bv_len < index_intlen ) {
int j, k, pad; int j, k, pad;
key->bv_val[0] = index_intlen; key->bv_val[0] = index_intlen;
k = index_intlen - tmp->bv_len + 1; k = index_intlen - iv.bv_len + 1;
if ( neg ) if ( neg )
pad = 0xff; pad = 0xff;
else else
pad = 0; pad = 0;
for ( j=1; j<k; j++) for ( j=1; j<k; j++)
key->bv_val[j] = pad; key->bv_val[j] = pad;
for ( j = 0; j<tmp->bv_len; j++ ) for ( j = 0; j<iv.bv_len; j++ )
key->bv_val[j+k] = tmp->bv_val[j]; key->bv_val[j+k] = iv.bv_val[j];
} else { } else {
key->bv_val[0] = tmp->bv_len; key->bv_val[0] = iv.bv_len;
memcpy( key->bv_val+1, tmp->bv_val, index_intlen ); memcpy( key->bv_val+1, iv.bv_val, index_intlen );
} }
if ( neg ) { if ( neg ) {
key->bv_val[0] = -key->bv_val[0]; key->bv_val[0] = -key->bv_val[0];