From bbeec83869d4ea6f36d143e5dddfddfa16324301 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 17 Nov 1999 22:53:54 +0000 Subject: [PATCH] ITS#357 (cont): Don't crash on at_cn == NULL. --- servers/slapd/back-bdb2/index.c | 8 ++++++++ servers/slapd/back-ldbm/index.c | 10 ++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/servers/slapd/back-bdb2/index.c b/servers/slapd/back-bdb2/index.c index 4c078b5790..d21fc45ed3 100644 --- a/servers/slapd/back-bdb2/index.c +++ b/servers/slapd/back-bdb2/index.c @@ -254,8 +254,16 @@ bdb2i_index_add_values( if ( indexmask == 0 ) { return( 0 ); } + at_cn = at_canonical_name(type); + if ( at_cn == NULL ) { + Debug( LDAP_DEBUG_ANY, + "<= bdb2i_index_add_values no canonical name for type \"%s\"\n", + type != NULL ? type : "(NULL)", 0, 0 ); + return( -1 ); + } + if ( (db = bdb2i_cache_open( be, at_cn, BDB2_SUFFIX, LDBM_WRCREAT )) == NULL ) { Debug( LDAP_DEBUG_ANY, diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c index d3b0795304..7c6f8a7a02 100644 --- a/servers/slapd/back-ldbm/index.c +++ b/servers/slapd/back-ldbm/index.c @@ -314,12 +314,18 @@ index_change_values( at_cn = at_canonical_name( type ); + if ( at_cn == NULL ) { + Debug( LDAP_DEBUG_ANY, + "<= index_change_values no canonical name for type \"%s\"\n", + type != NULL ? type : "(NULL)", 0, 0 ); + return( -1 ); + } + if ( (db = ldbm_cache_open( be, at_cn, LDBM_SUFFIX, mode )) == NULL ) { Debug( LDAP_DEBUG_ANY, "<= index_change_values (couldn't open(%s%s),md=%s)\n", - at_cn, - LDBM_SUFFIX, + at_cn, LDBM_SUFFIX, ((mode==LDBM_WRCREAT)?"LDBM_WRCREAT":"LDBM_WRITER") ); return( -1 ); } -- 2.39.5