From: Howard Chu <hyc@openldap.org>
Date: Fri, 11 Jan 2008 00:44:12 +0000 (+0000)
Subject: ITS#5322 don't try to free a NULL locker
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~224
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=37d65aed6e108ba43e158121086df6ce0076bd85;p=openldap

ITS#5322 don't try to free a NULL locker
---

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 253a3d6098..f87adbeac7 100644
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -600,7 +600,7 @@ bdb_db_close( BackendDB *be, ConfigReply *cr )
 	/* close db environment */
 	if( bdb->bi_dbenv ) {
 		/* Free cache locker if we enabled locking */
-		if ( !( slapMode & SLAP_TOOL_QUICK )) {
+		if ( !( slapMode & SLAP_TOOL_QUICK ) && bdb->bi_cache.c_locker ) {
 #if DB_VERSION_FULL >= 0x04060012
 			XLOCK_ID_FREE(bdb->bi_dbenv, bdb->bi_cache.c_locker->id);
 #else