From: Howard Chu <hyc@openldap.org>
Date: Mon, 2 Nov 2020 16:01:14 +0000 (+0000)
Subject: [PATCH] ITS#9384 remove assert in obsolete csnNormalize23()
X-Git-Tag: archive/raspbian/2.4.47+dfsg-3+rpi1+deb10u5^2~15
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=81ca2a061f26ca8b0851d1fbf0987c012bb76f3a;p=openldap.git

[PATCH] ITS#9384 remove assert in obsolete csnNormalize23()


Gbp-Pq: Name ITS-9384-remove-assert-in-obsolete-csnNormalize23.patch
---

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index cd979cc5..d6a54ad0 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -5315,8 +5315,8 @@ csnNormalize23(
 	}
 	*ptr = '\0';
 
-	assert( ptr == &bv.bv_val[bv.bv_len] );
-	if ( csnValidate( syntax, &bv ) != LDAP_SUCCESS ) {
+	if ( ptr != &bv.bv_val[bv.bv_len] ||
+		csnValidate( syntax, &bv ) != LDAP_SUCCESS ) {
 		return LDAP_INVALID_SYNTAX;
 	}