projects
/
openldap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
558db3c
)
[PATCH] ITS#9384 remove assert in obsolete csnNormalize23()
author
Howard Chu
<hyc@openldap.org>
Mon, 2 Nov 2020 16:01:14 +0000
(16:01 +0000)
committer
Ryan Tandy
<ryan@nardis.ca>
Tue, 17 Nov 2020 01:23:45 +0000
(
01:23
+0000)
Gbp-Pq: Name ITS-9384-remove-assert-in-obsolete-csnNormalize23.patch
servers/slapd/schema_init.c
patch
|
blob
|
history
diff --git
a/servers/slapd/schema_init.c
b/servers/slapd/schema_init.c
index cd979cc5ac778b96f9f1f1c6af63a4ebea0884f9..d6a54ad0b676e3388ab9947aa62818d7fafdb686 100644
(file)
--- 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;
}