From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 4 Aug 2009 14:26:40 +0000 (+0000)
Subject: improve previous commit
X-Git-Tag: ACLCHECK_0~362
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3e2ac1f6c0b3eb0b53909a7bd71d40a899f92e34;p=openldap

improve previous commit
---

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index b1e06e7b7f..1957190ab3 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -353,7 +353,7 @@ certificateListValidate( Syntax *syntax, struct berval *in )
 	/* Must be at end now */
 	/* NOTE: OpenSSL tolerates CL with garbage past the end */
 	if ( len || tag != LBER_DEFAULT ) {
-		struct berval issuer_dn, thisUpdate;
+		struct berval issuer_dn = BER_BVNULL, thisUpdate;
 		char tubuf[STRLENOF("YYYYmmddHHMMSSZ") + 1];
 		int rc;
 
@@ -379,7 +379,9 @@ certificateListValidate( Syntax *syntax, struct berval *in )
 			issuer_dn.bv_val, thisUpdate.bv_val, 0 );
 
 done:;
-		ber_memfree( issuer_dn.bv_val );
+		if ( ! BER_BVISNULL( &issuer_dn ) ) {
+			ber_memfree( issuer_dn.bv_val );
+		}
 
 		return rc;
 	}
@@ -3663,6 +3665,9 @@ checkTime( struct berval *in, struct berval *out )
 
 	rc = generalizedTimeValidate( NULL, &bv );
 	if ( rc == LDAP_SUCCESS && out != NULL ) {
+		if ( out->bv_len > bv.bv_len ) {
+			out->bv_val[ bv.bv_len ] = '\0';
+		}
 		out->bv_len = bv.bv_len;
 	}