/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include "lber-int.h"
#include "ldap_log.h"
+ber_slen_t
+ber_skip_data(
+ BerElement *ber,
+ ber_len_t len )
+{
+ ber_len_t actuallen, nleft;
+
+ assert( ber != NULL );
+ assert( LBER_VALID( ber ) );
+
+ nleft = ber_pvt_ber_remaining( ber );
+ actuallen = nleft < len ? nleft : len;
+ ber->ber_ptr += actuallen;
+ ber->ber_tag = *(unsigned char *)ber->ber_ptr;
+
+ return( (ber_slen_t) actuallen );
+}
+
+/*
+ * Read from the ber buffer. The caller must maintain ber->ber_tag.
+ * Do not use to read whole tags. See ber_get_tag() and ber_skip_data().
+ */
ber_slen_t
ber_read(
BerElement *ber,
assert( ber != NULL );
assert( buf != NULL );
-
assert( LBER_VALID( ber ) );
nleft = ber_pvt_ber_remaining( ber );
return( (ber_slen_t) actuallen );
}
+/*
+ * Write to the ber buffer.
+ * Note that ber_start_seqorset/ber_put_seqorset() bypass ber_write().
+ */
ber_slen_t
ber_write(
BerElement *ber,
LDAP_CONST char *buf,
ber_len_t len,
- int nosos )
+ int zero ) /* nonzero is unsupported from OpenLDAP 2.4.18 */
{
+ char **p;
+
assert( ber != NULL );
assert( buf != NULL );
-
assert( LBER_VALID( ber ) );
- if ( nosos || ber->ber_sos == NULL ) {
- if ( ber->ber_ptr + len > ber->ber_end ) {
- if ( ber_realloc( ber, len ) != 0 ) return( -1 );
- }
- AC_MEMCPY( ber->ber_ptr, buf, (size_t)len );
- ber->ber_ptr += len;
- return( (ber_slen_t) len );
+ if ( zero != 0 ) {
+ ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug, "%s",
+ "ber_write: nonzero 4th argument not supported\n" );
+ return( -1 );
+ }
- } else {
- if ( ber->ber_sos->sos_ptr + len > ber->ber_end ) {
- if ( ber_realloc( ber, len ) != 0 ) return( -1 );
- }
- AC_MEMCPY( ber->ber_sos->sos_ptr, buf, (size_t)len );
- ber->ber_sos->sos_ptr += len;
- ber->ber_sos->sos_clen += len;
- return( (ber_slen_t) len );
+ p = ber->ber_sos_ptr == NULL ? &ber->ber_ptr : &ber->ber_sos_ptr;
+ if ( len > (ber_len_t) (ber->ber_end - *p) ) {
+ if ( ber_realloc( ber, len ) != 0 ) return( -1 );
}
+ AC_MEMCPY( *p, buf, len );
+ *p += len;
+
+ return( (ber_slen_t) len );
}
+/* Resize the ber buffer */
int
ber_realloc( BerElement *ber, ber_len_t len )
{
- ber_len_t total;
- Seqorset *s;
- long off;
- char *oldbuf;
+ ber_len_t total, offset, sos_offset;
+ char *buf;
assert( ber != NULL );
- assert( len > 0 );
assert( LBER_VALID( ber ) );
+ /* leave room for ber_flatten() to \0-terminate ber_buf */
+ if ( ++len == 0 ) {
+ return( -1 );
+ }
+
total = ber_pvt_ber_total( ber );
#define LBER_EXBUFSIZ 4060 /* a few words less than 2^N for binary buddy */
/* don't realloc by small amounts */
total += len < LBER_EXBUFSIZ ? LBER_EXBUFSIZ : len;
# else
- { /* not sure what value this adds */
+ { /* not sure what value this adds. reduce fragmentation? */
ber_len_t have = (total + (LBER_EXBUFSIZE - 1)) / LBER_EXBUFSIZ;
ber_len_t need = (len + (LBER_EXBUFSIZ - 1)) / LBER_EXBUFSIZ;
total = ( have + need ) * LBER_EXBUFSIZ;
total += len; /* realloc just what's needed */
#endif
- oldbuf = ber->ber_buf;
-
- ber->ber_buf = (char *) ber_memrealloc_x( oldbuf, total, ber->ber_memctx );
-
- if ( ber->ber_buf == NULL ) {
- ber->ber_buf = oldbuf;
+ if ( total < len || total > (ber_len_t)-1 / 2 /* max ber_slen_t */ ) {
return( -1 );
}
- ber->ber_end = ber->ber_buf + total;
-
- /*
- * If the stinking thing was moved, we need to go through and
- * reset all the sos and ber pointers. Offsets would've been
- * a better idea... oh well.
- */
-
- if ( ber->ber_buf != oldbuf ) {
- ber->ber_ptr = ber->ber_buf + (ber->ber_ptr - oldbuf);
+ buf = ber->ber_buf;
+ offset = ber->ber_ptr - buf;
+ sos_offset = ber->ber_sos_ptr ? ber->ber_sos_ptr - buf : 0;
+ /* if ber_sos_ptr != NULL, it is > ber_buf so that sos_offset > 0 */
- for ( s = ber->ber_sos; s != NULL; s = s->sos_next ) {
- off = s->sos_first - oldbuf;
- s->sos_first = ber->ber_buf + off;
-
- off = s->sos_ptr - oldbuf;
- s->sos_ptr = ber->ber_buf + off;
- }
+ buf = (char *) ber_memrealloc_x( buf, total, ber->ber_memctx );
+ if ( buf == NULL ) {
+ return( -1 );
}
+ ber->ber_buf = buf;
+ ber->ber_end = buf + total;
+ ber->ber_ptr = buf + offset;
+ if ( sos_offset )
+ ber->ber_sos_ptr = buf + sos_offset;
+
return( 0 );
}
void
ber_free_buf( BerElement *ber )
{
- Seqorset *s, *next;
-
assert( LBER_VALID( ber ) );
if ( ber->ber_buf) ber_memfree_x( ber->ber_buf, ber->ber_memctx );
- for( s = ber->ber_sos ; s != NULL ; s = next ) {
- next = s->sos_next;
- ber_memfree_x( s, ber->ber_memctx );
- }
-
ber->ber_buf = NULL;
- ber->ber_sos = NULL;
+ ber->ber_sos_ptr = NULL;
ber->ber_valid = LBER_UNINITIALIZED;
}
void
ber_free( BerElement *ber, int freebuf )
{
-#ifdef LDAP_MEMORY_DEBUG
- assert( ber != NULL );
-#endif
-
if( ber == NULL ) {
+ LDAP_MEMORY_DEBUG_ASSERT( ber != NULL );
return;
}
assert( sb != NULL );
assert( ber != NULL );
-
assert( SOCKBUF_VALID( sb ) );
assert( LBER_VALID( ber ) );
"ber_flush2: %ld bytes to sd %ld%s\n",
towrite, (long) sb->sb_fd,
ber->ber_rwptr != ber->ber_buf ? " (re-flush)" : "" );
- ber_log_bprint( LDAP_DEBUG_PACKETS, sb->sb_debug,
+ ber_log_bprint( LDAP_DEBUG_BER, sb->sb_debug,
ber->ber_rwptr, towrite );
}
ber->ber_rwptr += rc;
}
-done:;
if ( freeit & LBER_FLUSH_FREE_ON_SUCCESS ) ber_free( ber, 1 );
return 0;
bv->bv_val = NULL;
bv->bv_len = 0;
+ } else if ( ber->ber_sos_ptr != NULL ) {
+ /* unmatched "{" and "}" */
+ return -1;
+
} else {
/* copy the berval */
ber_len_t len = ber_pvt_ber_write( ber );
return -1;
}
AC_MEMCPY( bv->bv_val, ber->ber_buf, len );
- } else {
+ bv->bv_val[len] = '\0';
+ } else if ( ber->ber_buf != NULL ) {
bv->bv_val = ber->ber_buf;
+ bv->bv_val[len] = '\0';
+ } else {
+ bv->bv_val = "";
}
- bv->bv_val[len] = '\0';
bv->bv_len = len;
}
return 0;
assert( sb != NULL );
assert( len != NULL );
assert( ber != NULL );
-
assert( SOCKBUF_VALID( sb ) );
assert( LBER_VALID( ber ) );
- ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
- "ber_get_next\n" );
+ if ( ber->ber_debug & LDAP_DEBUG_TRACE ) {
+ ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
+ "ber_get_next\n" );
+ }
/*
* Any ber element looks like this: tag length contents.
}
while (ber->ber_rwptr > (char *)&ber->ber_tag && ber->ber_rwptr <
- (char *)&ber->ber_len + LENSIZE*2 -1) {
+ (char *)&ber->ber_len + LENSIZE*2) {
ber_slen_t sblen;
char buf[sizeof(ber->ber_len)-1];
ber_len_t tlen = 0;
- errno = 0;
- sblen=ber_int_sb_read( sb, ber->ber_rwptr,
- ((char *)&ber->ber_len + LENSIZE*2 - 1)-ber->ber_rwptr);
+ /* The tag & len can be at most 9 bytes; we try to read up to 8 here */
+ sock_errset(0);
+ sblen=((char *)&ber->ber_len + LENSIZE*2 - 1)-ber->ber_rwptr;
+ /* Trying to read the last len byte of a 9 byte tag+len */
+ if (sblen<1)
+ sblen = 1;
+ sblen=ber_int_sb_read( sb, ber->ber_rwptr, sblen );
if (sblen<=0) return LBER_DEFAULT;
ber->ber_rwptr += sblen;
break;
/* Is the tag too big? */
if (i == sizeof(ber_tag_t)-1) {
- errno = ERANGE;
+ sock_errset(ERANGE);
return LBER_DEFAULT;
}
}
/* Did we run out of bytes? */
if ((char *)p == ber->ber_rwptr) {
-#if defined( EWOULDBLOCK )
- errno = EWOULDBLOCK;
-#elif defined( EAGAIN )
- errno = EAGAIN;
-#endif
+ sock_errset(EWOULDBLOCK);
return LBER_DEFAULT;
}
}
}
if ( ber->ber_ptr == ber->ber_rwptr ) {
-#if defined( EWOULDBLOCK )
- errno = EWOULDBLOCK;
-#elif defined( EAGAIN )
- errno = EAGAIN;
-#endif
+ sock_errset(EWOULDBLOCK);
return LBER_DEFAULT;
}
int i;
unsigned char *p = (unsigned char *)ber->ber_ptr;
int llen = *p++ & 0x7f;
- if (llen > (int)sizeof(ber_len_t)) {
- errno = ERANGE;
+ if (llen > LENSIZE) {
+ sock_errset(ERANGE);
return LBER_DEFAULT;
}
/* Not enough bytes? */
if (ber->ber_rwptr - (char *)p < llen) {
-#if defined( EWOULDBLOCK )
- errno = EWOULDBLOCK;
-#elif defined( EAGAIN )
- errno = EAGAIN;
-#endif
+ sock_errset(EWOULDBLOCK);
return LBER_DEFAULT;
}
for (i=0; i<llen; i++) {
/* make sure length is reasonable */
if ( ber->ber_len == 0 ) {
- errno = ERANGE;
+ sock_errset(ERANGE);
return LBER_DEFAULT;
}
ber_log_printf( LDAP_DEBUG_CONNS, ber->ber_debug,
"ber_get_next: sockbuf_max_incoming exceeded "
"(%ld > %ld)\n", ber->ber_len, sb->sb_max_incoming );
- errno = ERANGE;
+ sock_errset(ERANGE);
return LBER_DEFAULT;
}
* already read.
*/
if ( ber->ber_len < sblen + l ) {
- errno = ERANGE;
+ sock_errset(ERANGE);
return LBER_DEFAULT;
}
ber->ber_buf = (char *) ber_memalloc_x( ber->ber_len + 1, ber->ber_memctx );
to_go = ber->ber_end - ber->ber_rwptr;
assert( to_go > 0 );
- errno = 0;
+ sock_errset(0);
res = ber_int_sb_read( sb, ber->ber_rwptr, to_go );
if (res<=0) return LBER_DEFAULT;
ber->ber_rwptr+=res;
if (res<to_go) {
-#if defined( EWOULDBLOCK )
- errno = EWOULDBLOCK;
-#elif defined( EAGAIN )
- errno = EAGAIN;
-#endif
+ sock_errset(EWOULDBLOCK);
return LBER_DEFAULT;
}
done:
ber_rewind ( BerElement * ber )
{
ber->ber_rwptr = NULL;
- ber->ber_sos = NULL;
+ ber->ber_sos_ptr = NULL;
ber->ber_end = ber->ber_ptr;
ber->ber_ptr = ber->ber_buf;
+#if 0 /* TODO: Should we add this? */
+ ber->ber_tag = LBER_DEFAULT;
+ ber->ber_usertag = 0;
+#endif
}
int
projects / openldap / blobdiff