ITS#5183 - better delete index handling

[openldap] / servers / slapd / syntax.c

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index b289dd1f65b8469b83833c70ca1d9a377412590a..249f3681d9449df45f56784e9dbbdd15e8c1e52e 100644 (file)
--- a/servers/slapd/syntax.c
+++ b/servers/slapd/syntax.c
@@ -108,13 +108,16 @@ syn_is_sup( Syntax *syn, Syntax *sup )
 void
 syn_destroy( void )
 {
-       Syntax *s;
-
-       avl_free(syn_index, ldap_memfree);
-       while( !LDAP_SLIST_EMPTY(&syn_list) ) {
-               s = LDAP_SLIST_FIRST(&syn_list);
-               LDAP_SLIST_REMOVE_HEAD(&syn_list, ssyn_next);
-               ldap_syntax_free((LDAPSyntax *)s);
+       Syntax  *s;
+
+       avl_free( syn_index, ldap_memfree );
+       while( !LDAP_SLIST_EMPTY( &syn_list ) ) {
+               s = LDAP_SLIST_FIRST( &syn_list );
+               LDAP_SLIST_REMOVE_HEAD( &syn_list, ssyn_next );
+               if ( s->ssyn_sups ) {
+                       SLAP_FREE( s->ssyn_sups );
+               }
+               ldap_syntax_free( (LDAPSyntax *)s );
        }
 }
 
@@ -161,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) );
@@ -180,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;
@@ -192,19 +197,32 @@ syn_add(
                        ;
                
                ssyn->ssyn_sups = (Syntax **)SLAP_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;
+                       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;