From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 7 Apr 2004 18:58:32 +0000 (+0000)
Subject: ITS#3065: fix vector handling to ensure its free()able
X-Git-Tag: OPENLDAP_REL_ENG_2_2_BP~98
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=859e2827800b8eb568a89aec00a3d8f1b8a192db;p=openldap

ITS#3065: fix vector handling to ensure its free()able
---

diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c
index 9da7f35409..5f8db3196b 100644
--- a/libraries/libldap/schema.c
+++ b/libraries/libldap/schema.c
@@ -1183,8 +1183,8 @@ parse_qdescrs(const char **sp, int *code)
 					}
 					res = res1;
 				}
-				res[pos] = sval;
-				pos++;
+				res[pos++] = sval;
+				res[pos] = NULL;
 				parse_whsp(sp);
 			} else {
 				LDAP_VFREE(res);
@@ -1193,7 +1193,6 @@ parse_qdescrs(const char **sp, int *code)
 				return(NULL);
 			}
 		}
-		res[pos] = NULL;
 		parse_whsp(sp);
 		return(res);
 	} else if ( kind == TK_QDESCR ) {
@@ -1311,8 +1310,8 @@ parse_oids(const char **sp, int *code, const int allow_quoted)
 		kind = get_token(sp,&sval);
 		if ( kind == TK_BAREWORD ||
 		     ( allow_quoted && kind == TK_QDSTRING ) ) {
-			res[pos] = sval;
-			pos++;
+			res[pos++] = sval;
+			res[pos] = NULL;
 		} else {
 			*code = LDAP_SCHERR_UNEXPTOKEN;
 			LDAP_FREE(sval);
@@ -1341,8 +1340,8 @@ parse_oids(const char **sp, int *code, const int allow_quoted)
 						}
 						res = res1;
 					}
-					res[pos] = sval;
-					pos++;
+					res[pos++] = sval;
+					res[pos] = NULL;
 				} else {
 					*code = LDAP_SCHERR_UNEXPTOKEN;
 					LDAP_FREE(sval);
@@ -1357,7 +1356,6 @@ parse_oids(const char **sp, int *code, const int allow_quoted)
 				return NULL;
 			}
 		}
-		res[pos] = NULL;
 		parse_whsp(sp);
 		return(res);
 	} else if ( kind == TK_BAREWORD ||