X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fch_malloc.c;h=7919449695fe2ca729ffa654d7dfb06af87e18a3;hb=49b0985c88ea6836a24c314aea2cb2dd0d129544;hp=8084b7e2d0a0d8ed971588bb1412f4a3e2ac5414;hpb=f897519d11b039518f5a9985be6b0f4ba5edbbea;p=openldap
diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 8084b7e2d0..7919449695 100644
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,8 +1,27 @@
/* ch_malloc.c - malloc routines that test returns from malloc and friends */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
*/
#define CH_FREE 1
@@ -53,7 +72,7 @@ ch_realloc(
ber_len_t size
)
{
- void *new;
+ void *new, *ctx;
if ( block == NULL ) {
return( ch_malloc( size ) );
@@ -63,6 +82,11 @@ ch_realloc(
ch_free( block );
}
+ ctx = sl_context( block );
+ if ( ctx ) {
+ return sl_realloc( block, size, ctx );
+ }
+
if ( (new = (void *) ber_memrealloc_x( block, size, NULL )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
@@ -126,6 +150,13 @@ ch_strdup(
void
ch_free( void *ptr )
{
- ber_memfree_x( ptr, NULL );
+ void *ctx;
+
+ ctx = sl_context( ptr );
+ if (ctx) {
+ sl_free( ptr, ctx );
+ } else {
+ ber_memfree_x( ptr, NULL );
+ }
}