Braced ldap_connect_to_path() in #ifdef LDAP_PF_LOCAL so as to compile

[openldap] / libraries / libldap / schema.c

diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c
index d5bc4e8bc404e8fb173be25deead14b687109bbc..78fbe8a3fa25079f7ee5a5e89017a1076b53a066 100644 (file)
--- a/libraries/libldap/schema.c
+++ b/libraries/libldap/schema.c
@@ -1,7 +1,9 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- *
+ */
+/*
  * schema.c:  parsing routines used by servers and clients to process
  *     schema definitions
  */
@@ -19,6 +21,38 @@
 
 #include <ldap_schema.h>
 
+
+static LDAP_CONST char *
+choose_name( char *names[], LDAP_CONST char *fallback )
+{
+       return( (names != NULL && names[0] != NULL) ? names[0] : fallback );
+}
+
+LDAP_CONST char *
+ldap_syntax2name( LDAP_SYNTAX * syn )
+{
+       return( syn->syn_oid );
+}
+
+LDAP_CONST char *
+ldap_matchingrule2name( LDAP_MATCHING_RULE * mr )
+{
+       return( choose_name( mr->mr_names, mr->mr_oid ) );
+}
+
+LDAP_CONST char *
+ldap_attributetype2name( LDAP_ATTRIBUTE_TYPE * at )
+{
+       return( choose_name( at->at_names, at->at_oid ) );
+}
+
+LDAP_CONST char *
+ldap_objectclass2name( LDAP_OBJECT_CLASS * oc )
+{
+       return( choose_name( oc->oc_names, oc->oc_oid ) );
+}
+
+
 /*
  * When pretty printing the entities we will be appending to a buffer.
  * Since checking for overflow, realloc'ing and checking if no error
@@ -531,6 +565,7 @@ get_token(const char ** sp, char ** token_val)
        const char * q;
        char * res;
 
+       *token_val = NULL;
        switch (**sp) {
        case '\0':
                kind = TK_EOS;
@@ -572,7 +607,12 @@ get_token(const char ** sp, char ** token_val)
        default:
                kind = TK_BAREWORD;
                p = *sp;
-               while ( !isspace(**sp) && **sp != '\0' )
+               while ( !isspace(**sp) &&
+                       **sp != '(' &&
+                       **sp != ')' &&
+                       **sp != '$' &&
+                       **sp != '\'' &&
+                       **sp != '\0' )
                        (*sp)++;
                q = *sp;
                res = LDAP_MALLOC(q-p+1);
@@ -694,6 +734,7 @@ parse_qdescrs(const char **sp, int *code)
                                        res1 = LDAP_REALLOC(res,size*sizeof(char *));
                                        if ( !res1 ) {
                                                LDAP_VFREE(res);
+                                               LDAP_FREE(sval);
                                                *code = LDAP_SCHERR_OUTOFMEM;
                                                return(NULL);
                                        }
@@ -704,6 +745,7 @@ parse_qdescrs(const char **sp, int *code)
                                parse_whsp(sp);
                        } else {
                                LDAP_VFREE(res);
+                               LDAP_FREE(sval);
                                *code = LDAP_SCHERR_UNEXPTOKEN;
                                return(NULL);
                        }
@@ -722,6 +764,7 @@ parse_qdescrs(const char **sp, int *code)
                parse_whsp(sp);
                return res;
        } else {
+               LDAP_FREE(sval);
                *code = LDAP_SCHERR_BADNAME;
                return NULL;
        }
@@ -737,6 +780,7 @@ parse_woid(const char **sp, int *code)
        parse_whsp(sp);
        kind = get_token(sp, &sval);
        if ( kind != TK_BAREWORD ) {
+               LDAP_FREE(sval);
                *code = LDAP_SCHERR_UNEXPTOKEN;
                return NULL;
        }
@@ -828,6 +872,7 @@ parse_oids(const char **sp, int *code, const int allow_quoted)
                        pos++;
                } else {
                        *code = LDAP_SCHERR_UNEXPTOKEN;
+                       LDAP_FREE(sval);
                        LDAP_VFREE(res);
                        return NULL;
                }
@@ -846,9 +891,10 @@ parse_oids(const char **sp, int *code, const int allow_quoted)
                                                size++;
                                                res1 = LDAP_REALLOC(res,size*sizeof(char *));
                                                if ( !res1 ) {
-                                                 LDAP_VFREE(res);
-                                                 *code = LDAP_SCHERR_OUTOFMEM;
-                                                 return(NULL);
+                                                       LDAP_FREE(sval);
+                                                       LDAP_VFREE(res);
+                                                       *code = LDAP_SCHERR_OUTOFMEM;
+                                                       return(NULL);
                                                }
                                                res = res1;
                                        }
@@ -856,12 +902,14 @@ parse_oids(const char **sp, int *code, const int allow_quoted)
                                        pos++;
                                } else {
                                        *code = LDAP_SCHERR_UNEXPTOKEN;
+                                       LDAP_FREE(sval);
                                        LDAP_VFREE(res);
                                        return NULL;
                                }
                                parse_whsp(sp);
                        } else {
                                *code = LDAP_SCHERR_UNEXPTOKEN;
+                               LDAP_FREE(sval);
                                LDAP_VFREE(res);
                                return NULL;
                        }
@@ -873,6 +921,7 @@ parse_oids(const char **sp, int *code, const int allow_quoted)
                    ( allow_quoted && kind == TK_QDSTRING ) ) {
                res = LDAP_CALLOC(2,sizeof(char *));
                if ( !res ) {
+                       LDAP_FREE(sval);
                        *code = LDAP_SCHERR_OUTOFMEM;
                        return NULL;
                }
@@ -881,6 +930,7 @@ parse_oids(const char **sp, int *code, const int allow_quoted)
                parse_whsp(sp);
                return res;
        } else {
+               LDAP_FREE(sval);
                *code = LDAP_SCHERR_BADNAME;
                return NULL;
        }
@@ -920,6 +970,7 @@ ldap_str2syntax( const char * s, int * code, const char ** errp )
 
        kind = get_token(&ss,&sval);
        if ( kind != TK_LEFTPAREN ) {
+               LDAP_FREE(sval);
                *code = LDAP_SCHERR_NOLEFTPAREN;
                ldap_syntax_free(syn);
                return NULL;
@@ -950,6 +1001,7 @@ ldap_str2syntax( const char * s, int * code, const char ** errp )
                        return syn;
                case TK_BAREWORD:
                        if ( !strcmp(sval,"DESC") ) {
+                               LDAP_FREE(sval);
                                if ( seen_desc ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -962,12 +1014,14 @@ ldap_str2syntax( const char * s, int * code, const char ** errp )
                                if ( kind != TK_QDSTRING ) {
                                        *code = LDAP_SCHERR_UNEXPTOKEN;
                                        *errp = ss;
+                                       LDAP_FREE(sval);
                                        ldap_syntax_free(syn);
                                        return NULL;
                                }
                                syn->syn_desc = sval;
                                parse_whsp(&ss);
                        } else if ( sval[0] == 'X' && sval[1] == '-' ) {
+                               LDAP_FREE(sval);
                                /* Should be parse_qdstrings */
                                ssdummy = parse_qdescrs(&ss, code);
                                if ( !ssdummy ) {
@@ -978,6 +1032,7 @@ ldap_str2syntax( const char * s, int * code, const char ** errp )
                        } else {
                                *code = LDAP_SCHERR_UNEXPTOKEN;
                                *errp = ss;
+                               LDAP_FREE(sval);
                                ldap_syntax_free(syn);
                                return NULL;
                        }
@@ -985,6 +1040,7 @@ ldap_str2syntax( const char * s, int * code, const char ** errp )
                default:
                        *code = LDAP_SCHERR_UNEXPTOKEN;
                        *errp = ss;
+                       LDAP_FREE(sval);
                        ldap_syntax_free(syn);
                        return NULL;
                }
@@ -1033,6 +1089,7 @@ ldap_str2matchingrule( const char * s, int * code, const char ** errp )
        kind = get_token(&ss,&sval);
        if ( kind != TK_LEFTPAREN ) {
                *code = LDAP_SCHERR_NOLEFTPAREN;
+               LDAP_FREE(sval);
                ldap_matchingrule_free(mr);
                return NULL;
        }
@@ -1056,7 +1113,8 @@ ldap_str2matchingrule( const char * s, int * code, const char ** errp )
                                } else {
                                        /* Non-numerical OID, ignore */
                                }
-                         }
+                       }
+                       LDAP_FREE(sval);
                } else {
                        *errp = ss;
                        ldap_matchingrule_free(mr);
@@ -1081,6 +1139,7 @@ ldap_str2matchingrule( const char * s, int * code, const char ** errp )
                        return mr;
                case TK_BAREWORD:
                        if ( !strcmp(sval,"NAME") ) {
+                               LDAP_FREE(sval);
                                if ( seen_name ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1097,6 +1156,7 @@ ldap_str2matchingrule( const char * s, int * code, const char ** errp )
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"DESC") ) {
+                               LDAP_FREE(sval);
                                if ( seen_desc ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1109,12 +1169,14 @@ ldap_str2matchingrule( const char * s, int * code, const char ** errp )
                                if ( kind != TK_QDSTRING ) {
                                        *code = LDAP_SCHERR_UNEXPTOKEN;
                                        *errp = ss;
+                                       LDAP_FREE(sval);
                                        ldap_matchingrule_free(mr);
                                        return NULL;
                                }
                                mr->mr_desc = sval;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"OBSOLETE") ) {
+                               LDAP_FREE(sval);
                                if ( seen_obsolete ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1125,6 +1187,7 @@ ldap_str2matchingrule( const char * s, int * code, const char ** errp )
                                mr->mr_obsolete = LDAP_SCHEMA_YES;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"SYNTAX") ) {
+                               LDAP_FREE(sval);
                                if ( seen_syntax ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1142,6 +1205,7 @@ ldap_str2matchingrule( const char * s, int * code, const char ** errp )
                                }
                                parse_whsp(&ss);
                        } else if ( sval[0] == 'X' && sval[1] == '-' ) {
+                               LDAP_FREE(sval);
                                /* Should be parse_qdstrings */
                                ssdummy = parse_qdescrs(&ss, code);
                                if ( !ssdummy ) {
@@ -1152,6 +1216,7 @@ ldap_str2matchingrule( const char * s, int * code, const char ** errp )
                        } else {
                                *code = LDAP_SCHERR_UNEXPTOKEN;
                                *errp = ss;
+                               LDAP_FREE(sval);
                                ldap_matchingrule_free(mr);
                                return NULL;
                        }
@@ -1159,6 +1224,7 @@ ldap_str2matchingrule( const char * s, int * code, const char ** errp )
                default:
                        *code = LDAP_SCHERR_UNEXPTOKEN;
                        *errp = ss;
+                       LDAP_FREE(sval);
                        ldap_matchingrule_free(mr);
                        return NULL;
                }
@@ -1195,9 +1261,6 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
        int seen_substr = 0;
        int seen_syntax = 0;
        int seen_usage = 0;
-       int seen_kind = 0;
-       int seen_must = 0;
-       int seen_may = 0;
        LDAP_ATTRIBUTE_TYPE * at;
        char ** ssdummy;
        const char * savepos;
@@ -1219,6 +1282,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
        kind = get_token(&ss,&sval);
        if ( kind != TK_LEFTPAREN ) {
                *code = LDAP_SCHERR_NOLEFTPAREN;
+               LDAP_FREE(sval);
                ldap_attributetype_free(at);
                return NULL;
        }
@@ -1257,7 +1321,8 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                } else {
                                        /* Non-numerical OID, ignore */
                                }
-                         }
+                       }
+                       LDAP_FREE(sval);
                } else {
                        *errp = ss;
                        ldap_attributetype_free(at);
@@ -1282,6 +1347,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                        return at;
                case TK_BAREWORD:
                        if ( !strcmp(sval,"NAME") ) {
+                               LDAP_FREE(sval);
                                if ( seen_name ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1298,6 +1364,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"DESC") ) {
+                               LDAP_FREE(sval);
                                if ( seen_desc ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1310,12 +1377,14 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                if ( kind != TK_QDSTRING ) {
                                        *code = LDAP_SCHERR_UNEXPTOKEN;
                                        *errp = ss;
+                                       LDAP_FREE(sval);
                                        ldap_attributetype_free(at);
                                        return NULL;
                                }
                                at->at_desc = sval;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"OBSOLETE") ) {
+                               LDAP_FREE(sval);
                                if ( seen_obsolete ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1326,6 +1395,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                at->at_obsolete = LDAP_SCHEMA_YES;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"SUP") ) {
+                               LDAP_FREE(sval);
                                if ( seen_sup ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1340,6 +1410,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"EQUALITY") ) {
+                               LDAP_FREE(sval);
                                if ( seen_equality ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1354,6 +1425,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"ORDERING") ) {
+                               LDAP_FREE(sval);
                                if ( seen_ordering ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1368,6 +1440,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"SUBSTR") ) {
+                               LDAP_FREE(sval);
                                if ( seen_substr ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1382,6 +1455,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"SYNTAX") ) {
+                               LDAP_FREE(sval);
                                if ( seen_syntax ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1402,6 +1476,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                }
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"SINGLE-VALUE") ) {
+                               LDAP_FREE(sval);
                                if ( at->at_single_value ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1411,6 +1486,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                at->at_single_value = LDAP_SCHEMA_YES;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"COLLECTIVE") ) {
+                               LDAP_FREE(sval);
                                if ( at->at_collective ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1420,6 +1496,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                at->at_collective = LDAP_SCHEMA_YES;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"NO-USER-MODIFICATION") ) {
+                               LDAP_FREE(sval);
                                if ( at->at_no_user_mod ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1429,6 +1506,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                at->at_no_user_mod = LDAP_SCHEMA_YES;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"USAGE") ) {
+                               LDAP_FREE(sval);
                                if ( seen_usage ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1441,6 +1519,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                if ( kind != TK_BAREWORD ) {
                                        *code = LDAP_SCHERR_UNEXPTOKEN;
                                        *errp = ss;
+                                       LDAP_FREE(sval);
                                        ldap_attributetype_free(at);
                                        return NULL;
                                }
@@ -1459,11 +1538,14 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                                else {
                                        *code = LDAP_SCHERR_UNEXPTOKEN;
                                        *errp = ss;
+                                       LDAP_FREE(sval);
                                        ldap_attributetype_free(at);
                                        return NULL;
                                }
+                               LDAP_FREE(sval);
                                parse_whsp(&ss);
                        } else if ( sval[0] == 'X' && sval[1] == '-' ) {
+                               LDAP_FREE(sval);
                                /* Should be parse_qdstrings */
                                ssdummy = parse_qdescrs(&ss, code);
                                if ( !ssdummy ) {
@@ -1474,6 +1556,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                        } else {
                                *code = LDAP_SCHERR_UNEXPTOKEN;
                                *errp = ss;
+                               LDAP_FREE(sval);
                                ldap_attributetype_free(at);
                                return NULL;
                        }
@@ -1481,6 +1564,7 @@ ldap_str2attributetype( const char * s, int * code, const char ** errp )
                default:
                        *code = LDAP_SCHERR_UNEXPTOKEN;
                        *errp = ss;
+                       LDAP_FREE(sval);
                        ldap_attributetype_free(at);
                        return NULL;
                }
@@ -1534,6 +1618,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
        kind = get_token(&ss,&sval);
        if ( kind != TK_LEFTPAREN ) {
                *code = LDAP_SCHERR_NOLEFTPAREN;
+               LDAP_FREE(sval);
                ldap_objectclass_free(oc);
                return NULL;
        }
@@ -1568,7 +1653,8 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                } else {
                                        /* Non-numerical OID, ignore */
                                }
-                         }
+                       }
+                       LDAP_FREE(sval);
                } else {
                        *errp = ss;
                        ldap_objectclass_free(oc);
@@ -1593,6 +1679,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                        return oc;
                case TK_BAREWORD:
                        if ( !strcmp(sval,"NAME") ) {
+                               LDAP_FREE(sval);
                                if ( seen_name ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1609,6 +1696,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"DESC") ) {
+                               LDAP_FREE(sval);
                                if ( seen_desc ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1621,12 +1709,14 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                if ( kind != TK_QDSTRING ) {
                                        *code = LDAP_SCHERR_UNEXPTOKEN;
                                        *errp = ss;
+                                       LDAP_FREE(sval);
                                        ldap_objectclass_free(oc);
                                        return NULL;
                                }
                                oc->oc_desc = sval;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"OBSOLETE") ) {
+                               LDAP_FREE(sval);
                                if ( seen_obsolete ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1637,6 +1727,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                oc->oc_obsolete = LDAP_SCHEMA_YES;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"SUP") ) {
+                               LDAP_FREE(sval);
                                if ( seen_sup ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1653,6 +1744,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                        return NULL;
                                }
                        } else if ( !strcmp(sval,"ABSTRACT") ) {
+                               LDAP_FREE(sval);
                                if ( seen_kind ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1663,6 +1755,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                oc->oc_kind = LDAP_SCHEMA_ABSTRACT;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"STRUCTURAL") ) {
+                               LDAP_FREE(sval);
                                if ( seen_kind ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1673,6 +1766,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                oc->oc_kind = LDAP_SCHEMA_STRUCTURAL;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"AUXILIARY") ) {
+                               LDAP_FREE(sval);
                                if ( seen_kind ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1683,6 +1777,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                oc->oc_kind = LDAP_SCHEMA_AUXILIARY;
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"MUST") ) {
+                               LDAP_FREE(sval);
                                if ( seen_must ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1698,6 +1793,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                }
                                parse_whsp(&ss);
                        } else if ( !strcmp(sval,"MAY") ) {
+                               LDAP_FREE(sval);
                                if ( seen_may ) {
                                        *code = LDAP_SCHERR_DUPOPT;
                                        *errp = ss;
@@ -1713,6 +1809,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                                }
                                parse_whsp(&ss);
                        } else if ( sval[0] == 'X' && sval[1] == '-' ) {
+                               LDAP_FREE(sval);
                                /* Should be parse_qdstrings */
                                ssdummy = parse_qdescrs(&ss, code);
                                if ( !ssdummy ) {
@@ -1723,6 +1820,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                        } else {
                                *code = LDAP_SCHERR_UNEXPTOKEN;
                                *errp = ss;
+                               LDAP_FREE(sval);
                                ldap_objectclass_free(oc);
                                return NULL;
                        }
@@ -1730,13 +1828,14 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
                default:
                        *code = LDAP_SCHERR_UNEXPTOKEN;
                        *errp = ss;
+                       LDAP_FREE(sval);
                        ldap_objectclass_free(oc);
                        return NULL;
                }
        }
 }
 
-static char *err2text[] = {
+static char *const err2text[] = {
        "",
        "Out of memory",
        "Unexpected token",