From: jinyaoguo <guo846@purdue.edu>
Date: Wed, 28 May 2025 02:01:25 +0000 (-0400)
Subject: ITS#10344 Ensure the first argument passed to ber_dupbv_x is not NULL.
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f00339df9ec3b5ebb69fb4b4c8ca863fd653397b;p=thirdparty%2Fopenldap.git

ITS#10344 Ensure the first argument passed to ber_dupbv_x is not NULL.
---

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 5c0c6c959f..d4ed9c5830 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -6159,7 +6159,7 @@ firstComponentNormalize(
 	struct berval comp;
 	ber_len_t len;
 
-	if( SLAP_MR_IS_VALUE_OF_ASSERTION_SYNTAX( usage )) {
+	if( normalized && SLAP_MR_IS_VALUE_OF_ASSERTION_SYNTAX( usage )) {
 		ber_dupbv_x( normalized, val, ctx );
 		return LDAP_SUCCESS;
 	}
diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index fbf44cfaa3..72cb72b920 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -91,6 +91,7 @@ static int objectClassPretty(
 	void *ctx )
 {
 	ObjectClass *oc;
+	assert( out != NULL );
 
 	if( oidValidate( NULL, in )) return LDAP_INVALID_SYNTAX;