upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 07:39:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

More malloc context tweaks

Browse source
This commit is contained in:
Howard Chu 2003-04-10 06:14:16 +00:00
parent 7287c0ff01
commit 42e7845d81
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/liblber/encode.c
View file

@ -442,7 +442,7 @@ ber_start_seqorset(
assert( ber != NULL ); assert( ber != NULL );
assert( LBER_VALID( ber ) ); assert( LBER_VALID( ber ) );
new = (Seqorset *) LBER_CALLOC( 1, sizeof(Seqorset) ); new = (Seqorset *) ber_memcalloc_x( 1, sizeof(Seqorset), ber->ber_memctx );
if ( new == NULL ) { if ( new == NULL ) {
return -1; return -1;
@ -649,7 +649,7 @@ ber_put_seqorset( BerElement *ber )
} }
/* we're done with this seqorset, so free it up */ /* we're done with this seqorset, so free it up */
LBER_FREE( (char *) (*sos) ); ber_memfree_x( (char *) (*sos), ber->ber_memctx );
*sos = next; *sos = next;
return taglen + lenlen + len; return taglen + lenlen + len;

6
libraries/liblber/io.c
View file

@ -160,11 +160,11 @@ ber_free_buf( BerElement *ber )
assert( LBER_VALID( ber ) ); assert( LBER_VALID( ber ) );
if ( ber->ber_buf) LBER_FREE( ber->ber_buf ); if ( ber->ber_buf) ber_memfree_x( ber->ber_buf, ber->ber_memctx );
for( s = ber->ber_sos ; s != NULL ; s = next ) { for( s = ber->ber_sos ; s != NULL ; s = next ) {
next = s->sos_next; next = s->sos_next;
LBER_FREE( s ); ber_memfree_x( s, ber->ber_memctx );
} }
ber->ber_buf = NULL; ber->ber_buf = NULL;
@ -186,7 +186,7 @@ ber_free( BerElement *ber, int freebuf )
if( freebuf ) if( freebuf )
ber_free_buf( ber ); ber_free_buf( ber );
LBER_FREE( (char *) ber ); ber_memfree_x( (char *) ber, ber->ber_memctx );
} }
int int