From: Ondřej Kuzník <ondra@mistotebe.net>
Date: Tue, 30 Aug 2022 12:17:27 +0000 (+0100)
Subject: ITS#9906 Do not touch subsys members after mss_destroy called
X-Git-Tag: OPENLDAP_REL_ENG_2_6_4~108
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c09ced8b673eca43b12949442620fd3121f20d8b;p=thirdparty%2Fopenldap.git

ITS#9906 Do not touch subsys members after mss_destroy called
---

diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c
index 1b6ab33a49..af79fb4cf0 100644
--- a/servers/slapd/back-monitor/init.c
+++ b/servers/slapd/back-monitor/init.c
@@ -2537,13 +2537,13 @@ monitor_back_db_destroy(
 		int	i;
 
 		for ( i = 0; monitor_subsys[ i ] != NULL; i++ ) {
-			if ( monitor_subsys[ i ]->mss_destroy ) {
-				monitor_subsys[ i ]->mss_destroy( be, monitor_subsys[ i ] );
-			}
-
 			if ( !BER_BVISNULL( &monitor_subsys[ i ]->mss_rdn ) ) {
 				ch_free( monitor_subsys[ i ]->mss_rdn.bv_val );
 			}
+
+			if ( monitor_subsys[ i ]->mss_destroy ) {
+				monitor_subsys[ i ]->mss_destroy( be, monitor_subsys[ i ] );
+			}
 		}
 
 		ch_free( monitor_subsys );