ITS#5339

[openldap] / servers / slapd / syntax.c

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index 8faffad0413ed7c96b2ff0db2c9563b6d6b0b1de..85025683ecc652998ec38f94043c65f92345a400 100644 (file)
--- a/servers/slapd/syntax.c
+++ b/servers/slapd/syntax.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -196,14 +196,19 @@ 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;
+                               }
                        }
                }
        }
@@ -211,9 +216,11 @@ syn_add(
        if ( code == 0 ) {
                code = syn_insert( ssyn, err );
 
-       } else if ( ssyn != NULL ) {
+       }
+
+       if ( code != 0 && ssyn != NULL ) {
                if ( ssyn->ssyn_sups != NULL ) {
-                       ch_free( ssyn->ssyn_sups );
+                       SLAP_FREE( ssyn->ssyn_sups );
                }
                SLAP_FREE( ssyn );
        }