ITS#5173 simplify defer open behavior

[openldap] / servers / slapd / syntax.c

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index b9fb273fe2176cee579c6dd8ba62b01d2ce7a239..249f3681d9449df45f56784e9dbbdd15e8c1e52e 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,20 +196,33 @@ syn_add(
                for ( cnt = 0; def->sd_sups[cnt] != NULL; cnt++ )
                        ;
                
-               ssyn->ssyn_sups = (Syntax **)ch_calloc( cnt + 1,
-                       sizeof(Syntax) );
-
-               for ( cnt = 0; def->sd_sups[cnt] != NULL; cnt++ ) {
-                       ssyn->ssyn_sups[cnt] = syn_find( def->sd_sups[cnt] );
-                       if ( ssyn->ssyn_sups[cnt] == NULL ) {
-                               *err = def->sd_sups[cnt];
-                               code = SLAP_SCHERR_SYN_SUP_NOT_FOUND;
+               ssyn->ssyn_sups = (Syntax **)SLAP_CALLOC( cnt + 1,
+                       sizeof( Syntax * ) );
+               if ( ssyn->ssyn_sups == NULL ) {
+                       Debug( LDAP_DEBUG_ANY, "SLAP_CALLOC Error\n", 0, 0, 0 );
+                       code = SLAP_SCHERR_OUTOFMEM;
+
+               } else {
+                       for ( cnt = 0; def->sd_sups[cnt] != NULL; cnt++ ) {
+                               ssyn->ssyn_sups[cnt] = syn_find( def->sd_sups[cnt] );
+                               if ( ssyn->ssyn_sups[cnt] == NULL ) {
+                                       *err = def->sd_sups[cnt];
+                                       code = SLAP_SCHERR_SYN_SUP_NOT_FOUND;
+                               }
                        }
                }
        }
 
        if ( code == 0 ) {
                code = syn_insert( ssyn, err );
+
+       }
+
+       if ( code != 0 && ssyn != NULL ) {
+               if ( ssyn->ssyn_sups != NULL ) {
+                       SLAP_FREE( ssyn->ssyn_sups );
+               }
+               SLAP_FREE( ssyn );
        }
 
        return code;