setting UFN prefix to NULL should clear prefix not cause crash.

[openldap] / libraries / liblber / options.c

diff --git a/libraries/liblber/options.c b/libraries/liblber/options.c
index 863f9396d5792e19e1146e2a2f8a6ff03675c181..03a4e3c56aae2cab66720efdf02d640092dd356f 100644 (file)
--- a/libraries/liblber/options.c
+++ b/libraries/liblber/options.c
@@ -1,10 +1,11 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 #include <ac/string.h>
 
 #include "lber-int.h"
@@ -18,13 +19,14 @@ ber_get_option(
        int             option,
        void    *outvalue)
 {
-       BerElement *ber;
-       Sockbuf *sb;
+       LDAP_CONST BerElement *ber;
+       LDAP_CONST Sockbuf *sb;
 
        ber_int_options.lbo_valid = LBER_INITIALIZED;
 
        if(outvalue == NULL) {
                /* no place to get to */
+               ber_errno = LBER_ERROR_PARAM;
                return LBER_OPT_ERROR;
        }
 
@@ -34,11 +36,12 @@ ber_get_option(
                        return LBER_OPT_SUCCESS;
                }
 
+               ber_errno = LBER_ERROR_PARAM;
                return LBER_OPT_ERROR;
        }
 
-       ber = (BerElement *) item;
-       sb = (Sockbuf *) item;
+       ber = item;
+       sb = item;
 
        switch(option) {
        case LBER_OPT_BER_OPTIONS:
@@ -51,8 +54,21 @@ ber_get_option(
                * (int *) outvalue = ber->ber_debug;
                return LBER_OPT_SUCCESS;
 
+       case LBER_OPT_BER_REMAINING_BYTES:
+               *((ber_len_t *) outvalue) = ber->ber_end - ber->ber_ptr;
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_TOTAL_BYTES:
+               *((ber_len_t *) outvalue) = ber->ber_end - ber->ber_buf;
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_BYTES_TO_WRITE:
+               *((ber_len_t *) outvalue) = ber->ber_ptr - ber->ber_buf;
+               return LBER_OPT_SUCCESS;
+
        default:
                /* bad param */
+               ber_errno = LBER_ERROR_PARAM;
                break;
        }
 
@@ -73,12 +89,14 @@ ber_set_option(
                && ( option == LBER_OPT_MEMORY_FNS )
                && ( invalue != NULL ))
        {
-               BerMemoryFunctions *f = (BerMemoryFunctions *) invalue;
+               const BerMemoryFunctions *f =
+                       (const BerMemoryFunctions *) invalue;
 
                /* make sure all functions are provided */
                if(!( f->bmf_malloc && f->bmf_calloc
                        && f->bmf_realloc && f->bmf_free ))
                {
+                       ber_errno = LBER_ERROR_PARAM;
                        return LBER_OPT_ERROR;
                }
 
@@ -86,6 +104,7 @@ ber_set_option(
                        (*(f->bmf_malloc))(sizeof(BerMemoryFunctions));
 
                if ( ber_int_memory_fns == NULL ) {
+                       ber_errno = LBER_ERROR_MEMORY;
                        return LBER_OPT_ERROR;
                }
 
@@ -99,12 +118,13 @@ ber_set_option(
 
        if(invalue == NULL) {
                /* no place to set from */
+               ber_errno = LBER_ERROR_PARAM;
                return LBER_OPT_ERROR;
        }
 
        if(item == NULL) {
                if(option == LBER_OPT_BER_DEBUG) {
-                       ber_int_debug = * (int *) invalue;
+                       ber_int_debug = * (const int *) invalue;
                        return LBER_OPT_SUCCESS;
 
                } else if(option == LBER_OPT_LOG_PRINT_FN) {
@@ -112,25 +132,39 @@ ber_set_option(
                        return LBER_OPT_SUCCESS;
                }
 
+               ber_errno = LBER_ERROR_PARAM;
                return LBER_OPT_ERROR;
        }
 
-       ber = (BerElement *) item;
-       sb = (Sockbuf *) item;
+       ber = item;
+       sb = item;
 
        switch(option) {
        case LBER_OPT_BER_OPTIONS:
                assert( BER_VALID( ber ) );
-               ber->ber_options = * (int *) invalue;
+               ber->ber_options = * (const int *) invalue;
                return LBER_OPT_SUCCESS;
 
        case LBER_OPT_BER_DEBUG:
                assert( BER_VALID( ber ) );
-               ber->ber_debug = * (int *) invalue;
+               ber->ber_debug = * (const int *) invalue;
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_REMAINING_BYTES:
+               ber->ber_end = &ber->ber_ptr[* (const ber_len_t *) invalue];
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_TOTAL_BYTES:
+               ber->ber_end = &ber->ber_buf[* (const ber_len_t *) invalue];
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_BYTES_TO_WRITE:
+               ber->ber_ptr = &ber->ber_buf[* (const ber_len_t *) invalue];
                return LBER_OPT_SUCCESS;
 
        default:
                /* bad param */
+               ber_errno = LBER_ERROR_PARAM;
                break;
        }