Fallout from ITS#4986 - remove unused param of select_backend()

[openldap] / servers / slapd / syntax.c

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index a2c201a2e8f4c642592d0871e84ee812638ee33c..8faffad0413ed7c96b2ff0db2c9563b6d6b0b1de 100644 (file)
--- a/servers/slapd/syntax.c
+++ b/servers/slapd/syntax.c
@@ -164,9 +164,9 @@ syn_add(
        int             code = 0;
 
        ssyn = (Syntax *) SLAP_CALLOC( 1, sizeof(Syntax) );
-       if( ssyn == NULL ) {
+       if ( ssyn == NULL ) {
                Debug( LDAP_DEBUG_ANY, "SLAP_CALLOC Error\n", 0, 0, 0 );
-               return LDAP_OTHER;
+               return SLAP_SCHERR_OUTOFMEM;
        }
 
        AC_MEMCPY( &ssyn->ssyn_syn, syn, sizeof(LDAPSyntax) );
@@ -183,6 +183,8 @@ syn_add(
        ssyn->ssyn_validate = def->sd_validate;
        ssyn->ssyn_pretty = def->sd_pretty;
 
+       ssyn->ssyn_sups = NULL;
+
 #ifdef SLAPD_BINARY_CONVERSION
        ssyn->ssyn_ber2str = def->sd_ber2str;
        ssyn->ssyn_str2ber = def->sd_str2ber;
@@ -194,7 +196,7 @@ syn_add(
                for ( cnt = 0; def->sd_sups[cnt] != NULL; cnt++ )
                        ;
                
-               ssyn->ssyn_sups = (Syntax **)SLAP_CALLOC( cnt + 1,
+               ssyn->ssyn_sups = (Syntax **)ch_calloc( cnt + 1,
                        sizeof(Syntax) );
 
                for ( cnt = 0; def->sd_sups[cnt] != NULL; cnt++ ) {
@@ -208,6 +210,12 @@ syn_add(
 
        if ( code == 0 ) {
                code = syn_insert( ssyn, err );
+
+       } else if ( ssyn != NULL ) {
+               if ( ssyn->ssyn_sups != NULL ) {
+                       ch_free( ssyn->ssyn_sups );
+               }
+               SLAP_FREE( ssyn );
        }
 
        return code;