Commit 03019fba authored by Howard Chu's avatar Howard Chu
Browse files

ITS#5105 fix from HEAD

parent 87c604f9
...@@ -265,10 +265,10 @@ ber_dump( ...@@ -265,10 +265,10 @@ ber_dump(
len = ber_pvt_ber_write(ber); len = ber_pvt_ber_write(ber);
} }
sprintf( buf, "ber_dump: buf=0x%08lx ptr=0x%08lx end=0x%08lx len=%ld\n", sprintf( buf, "ber_dump: buf=%p ptr=%p end=%p len=%ld\n",
(long) ber->ber_buf, ber->ber_buf,
(long) ber->ber_ptr, ber->ber_ptr,
(long) ber->ber_end, ber->ber_end,
(long) len ); (long) len );
(void) (*ber_pvt_log_print)( buf ); (void) (*ber_pvt_log_print)( buf );
...@@ -303,10 +303,10 @@ ber_sos_dump( ...@@ -303,10 +303,10 @@ ber_sos_dump(
(*ber_pvt_log_print)( "*** sos dump ***\n" ); (*ber_pvt_log_print)( "*** sos dump ***\n" );
while ( sos != NULL ) { while ( sos != NULL ) {
sprintf( buf, "ber_sos_dump: clen %ld first 0x%lx ptr 0x%lx\n", sprintf( buf, "ber_sos_dump: clen %ld first %p ptr %p\n",
(long) sos->sos_clen, (long) sos->sos_clen,
(long) sos->sos_first, sos->sos_first,
(long) sos->sos_ptr ); sos->sos_ptr );
(*ber_pvt_log_print)( buf ); (*ber_pvt_log_print)( buf );
sprintf( buf, " current len %ld contents:\n", sprintf( buf, " current len %ld contents:\n",
......
...@@ -373,7 +373,7 @@ ber_get_stringbvl( bgbvr *b, ber_len_t *rlen ) ...@@ -373,7 +373,7 @@ ber_get_stringbvl( bgbvr *b, ber_len_t *rlen )
case BvOff: case BvOff:
*b->res.ba = ber_memalloc_x( (n+1) * b->siz, b->ber->ber_memctx ); *b->res.ba = ber_memalloc_x( (n+1) * b->siz, b->ber->ber_memctx );
if ( *b->res.ba == NULL ) return LBER_DEFAULT; if ( *b->res.ba == NULL ) return LBER_DEFAULT;
((struct berval *)((long)(*b->res.ba) + n*b->siz + ((struct berval *)((char *)(*b->res.ba) + n*b->siz +
b->off))->bv_val = NULL; b->off))->bv_val = NULL;
break; break;
} }
...@@ -406,7 +406,7 @@ ber_get_stringbvl( bgbvr *b, ber_len_t *rlen ) ...@@ -406,7 +406,7 @@ ber_get_stringbvl( bgbvr *b, ber_len_t *rlen )
*bvp = bv; *bvp = bv;
break; break;
case BvOff: case BvOff:
*(BerVarray)((long)(*b->res.ba)+n*b->siz+b->off) = bv; *(BerVarray)((char *)(*b->res.ba)+n*b->siz+b->off) = bv;
break; break;
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment