27 lines
773 B
Diff
27 lines
773 B
Diff
|
From bdb0d459187522a6063df13871b82ba8dcc6efe2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Howard Chu <hyc@openldap.org>
|
||
|
|
Date: Mon, 2 Nov 2020 16:01:14 +0000
|
||
|
|
Subject: [PATCH] ITS#9384 remove assert in obsolete csnNormalize23()
|
||
|
|
|
||
|
|
---
|
||
|
|
servers/slapd/schema_init.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
|
||
|
|
index 5812bc4b66..ea0d67aa62 100644
|
||
|
|
--- a/servers/slapd/schema_init.c
|
||
|
|
+++ b/servers/slapd/schema_init.c
|
||
|
|
@@ -5327,8 +5327,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;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
GitLab
|