mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix dec to bin negative number handling

Browse Source
This commit is contained in:
Howard Chu 2007-11-21 01:49:09 +00:00
parent 9c8cf1bc04
commit beff004e1e
1 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libraries/liblutil/utils.c
View File

@ -663,6 +663,11 @@ scale( int new, _decnum *prev, unsigned char *tmp )
/* Convert unlimited length decimal or hex string to binary.
* Output buffer must be provided, bv_len must indicate buffer size
* Hex input can be "0x1234" or "'1234'H"
*
* Note: High bit of binary form is always the sign bit. If the number
* is supposed to be positive but has the high bit set, a zero byte
* is prepended. It is assumed that this has already been handled on
* any hex input.
*/
int
lutil_str2bin( struct berval *in, struct berval *out )
@ -723,6 +728,7 @@ lutil_str2bin( struct berval *in, struct berval *out )
/* Decimal */
char tmpbuf[64], *tmp;
_decnum num;
int neg = 0;
len = in->bv_len;
pin = in->bv_val;
@ -730,6 +736,11 @@ lutil_str2bin( struct berval *in, struct berval *out )
num.bufsiz = out->bv_len;
num.beg = num.bufsiz-1;
num.len = 0;
if ( pin[0] == '-' ) {
neg = 1;
len--;
pin++;
}
#define DECMAX 8 /* 8 digits at a time */
@ -757,6 +768,41 @@ lutil_str2bin( struct berval *in, struct berval *out )
len -= chunk;
chunk = DECMAX;
}
/* Negate the result */
if ( neg ) {
int i, j;
unsigned char *ptr;
ptr = num.buf+num.beg;
/* flip all bits */
for ( i=0; i<num.len; i++ )
ptr[i] ^= 0xff;
/* Add 1, with carry */
i--;
j = 1;
for ( ; i>=0; i-- ) {
j += ptr[i];
ptr[i] = j & 0xff;
j >>= 8;
if (!j)
break;
}
/* If we overflowed and there's still room,
* set an explicit sign byte
*/
if ( !( ptr[0] & 0x80 ) && num.beg ) {
num.beg--;
num.len++;
num.buf[num.beg] = 0x80;
}
} else if (( num.buf[num.beg] & 0x80 ) && num.beg ) {
/* positive int with high bit set, prepend 0 */
num.beg--;
num.len++;
num.buf[num.beg] = 0;
}
if ( num.beg )
AC_MEMCPY( num.buf, num.buf+num.beg, num.len );
out->bv_len = num.len;