vrFilter fixes

[openldap] / servers / slapd / ch_malloc.c

diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 43ec4c9adb08ebd63a0eaec3e9967f9bc3252379..c9af173946e0f06c03a56f9692ba91f180de5678 100644 (file)
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,58 +1,127 @@
 /* ch_malloc.c - malloc routines that test returns from malloc and friends */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
+#define CH_FREE 1
+
+#include "portable.h"
 
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/stdlib.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
 #include "slap.h"
 
-char *
+#ifndef CSRIMALLOC
+
+void *
 ch_malloc(
-    unsigned long      size
+    ber_len_t  size
 )
 {
-       char    *new;
+       void    *new;
 
-       if ( (new = (char *) malloc( size )) == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "malloc of %d bytes failed\n", size, 0, 0 );
-               exit( 1 );
+       if ( (new = (void *) ber_memalloc( size )) == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, ERR, 
+                          "ch_malloc: allocation of %lu bytes failed\n", (long)size, 0,0 );
+#else
+               Debug( LDAP_DEBUG_ANY, "ch_malloc of %lu bytes failed\n",
+                       (long) size, 0, 0 );
+#endif
+               assert( 0 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
 }
 
-char *
+void *
 ch_realloc(
-    char               *block,
-    unsigned long      size
+    void               *block,
+    ber_len_t  size
 )
 {
-       char    *new;
+       void    *new;
 
        if ( block == NULL ) {
                return( ch_malloc( size ) );
        }
 
-       if ( (new = (char *) realloc( block, size )) == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "realloc of %d bytes failed\n", size, 0, 0 );
-               exit( 1 );
+       if( size == 0 ) {
+               ch_free( block );
+       }
+
+       if ( (new = (void *) ber_memrealloc( block, size )) == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, ERR, 
+                          "ch_realloc: reallocation of %lu bytes failed\n", (long)size, 0,0 );
+#else
+               Debug( LDAP_DEBUG_ANY, "ch_realloc of %lu bytes failed\n",
+                       (long) size, 0, 0 );
+#endif
+               assert( 0 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
 }
 
-char *
+void *
 ch_calloc(
-    unsigned long      nelem,
-    unsigned long      size
+    ber_len_t  nelem,
+    ber_len_t  size
+)
+{
+       void    *new;
+
+       if ( (new = (void *) ber_memcalloc( nelem, size )) == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, ERR, 
+                          "ch_calloc: allocation of %lu elements of %lu bytes faild\n",
+                          (long)nelem, (long)size, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY, "ch_calloc of %lu elems of %lu bytes failed\n",
+                 (long) nelem, (long) size, 0 );
+#endif
+               assert( 0 );
+               exit( EXIT_FAILURE );
+       }
+
+       return( new );
+}
+
+char *
+ch_strdup(
+    const char *string
 )
 {
        char    *new;
 
-       if ( (new = (char *) calloc( nelem, size )) == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "calloc of %d elems of %d bytes failed\n",
-                 nelem, size, 0 );
-               exit( 1 );
+       if ( (new = ber_strdup( string )) == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, ERR, 
+                       "chr_strdup: duplication of \"%s\" failed\n", string, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY, "ch_strdup(%s) failed\n", string, 0, 0 );
+#endif
+               assert( 0 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
 }
+
+void
+ch_free( void *ptr )
+{
+       ber_memfree( ptr );
+}
+
+#endif