mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-01 14:15:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

consistently use SLAP_* malloc macros; alloc sizeof(Syntax *) instead of sizeof(Syntax) for areray of superiors; free resources also in case of failure of syn_insert()

Browse Source
This commit is contained in:
Pierangelo Masarati 2007-08-16 12:08:47 +00:00
parent 3771d2ed49
commit 51152d83a3
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
servers/slapd/syntax.c
View File

@ -196,14 +196,19 @@ syn_add(
for ( cnt = 0; def->sd_sups[cnt] != NULL; cnt++ ) for ( cnt = 0; def->sd_sups[cnt] != NULL; cnt++ )
; ;
ssyn->ssyn_sups = (Syntax **)ch_calloc( cnt + 1, ssyn->ssyn_sups = (Syntax **)SLAP_CALLOC( cnt + 1,
sizeof(Syntax) ); sizeof( Syntax * ) );
if ( ssyn->ssyn_sups == NULL ) {
Debug( LDAP_DEBUG_ANY, "SLAP_CALLOC Error\n", 0, 0, 0 );
code = SLAP_SCHERR_OUTOFMEM;
for ( cnt = 0; def->sd_sups[cnt] != NULL; cnt++ ) { } else {
ssyn->ssyn_sups[cnt] = syn_find( def->sd_sups[cnt] ); for ( cnt = 0; def->sd_sups[cnt] != NULL; cnt++ ) {
if ( ssyn->ssyn_sups[cnt] == NULL ) { ssyn->ssyn_sups[cnt] = syn_find( def->sd_sups[cnt] );
*err = def->sd_sups[cnt]; if ( ssyn->ssyn_sups[cnt] == NULL ) {
code = SLAP_SCHERR_SYN_SUP_NOT_FOUND; *err = def->sd_sups[cnt];
code = SLAP_SCHERR_SYN_SUP_NOT_FOUND;
}
} }
} }
} }
@ -211,9 +216,11 @@ syn_add(
if ( code == 0 ) { if ( code == 0 ) {
code = syn_insert( ssyn, err ); code = syn_insert( ssyn, err );
} else if ( ssyn != NULL ) { }
if ( code != 0 && ssyn != NULL ) {
if ( ssyn->ssyn_sups != NULL ) { if ( ssyn->ssyn_sups != NULL ) {
ch_free( ssyn->ssyn_sups ); SLAP_FREE( ssyn->ssyn_sups );
} }
SLAP_FREE( ssyn ); SLAP_FREE( ssyn );
} }