From f00339df9ec3b5ebb69fb4b4c8ca863fd653397b Mon Sep 17 00:00:00 2001 From: jinyaoguo Date: Tue, 27 May 2025 22:01:25 -0400 Subject: [PATCH] ITS#10344 Ensure the first argument passed to ber_dupbv_x is not NULL. --- servers/slapd/schema_init.c | 2 +- servers/slapd/schema_prep.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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; -- 2.47.2