Sync with 2.x

[openldap] / libraries / libldap / schema.c

diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c
index 9104d63d2fe1a171cbee4fc6cdfbe3f131320e47..094e9e06cc7632f9ce74f58d80dc6fd5669aaf1b 100644 (file)
--- a/libraries/libldap/schema.c
+++ b/libraries/libldap/schema.c
@@ -126,6 +126,10 @@ append_to_safe_string(safe_string * ss, char * s)
        /* We always make sure there is at least one position available */
        if ( ss->pos + l >= ss->size-1 ) {
                ss->size *= 2;
+               if ( ss->pos + l >= ss->size-1 ) {
+                       ss->size = ss->pos + l + 1;
+               }
+
                temp = LDAP_REALLOC(ss->val, ss->size);
                if ( !temp ) {
                        /* Trouble, out of memory */
@@ -1977,6 +1981,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp, const int
                *code = LDAP_SCHERR_OUTOFMEM;
                return NULL;
        }
+       oc->oc_kind = LDAP_SCHEMA_STRUCTURAL;
 
        kind = get_token(&ss,&sval);
        if ( kind != TK_LEFTPAREN ) {