ITS#6012

diff --git a/CHANGES b/CHANGES
index 153b3cf038665a9f8d36abcbfc30ce12bb2d3c5a..2c61d998884faf992b3efaf91ae42b74f7e20813 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@ OpenLDAP 2.4.16 Engineering
        Fixed slapd syncrepl skipped entries with MMR (ITS#5988)
        Fixed slapd-bdb/hdb cachesize handling (ITS#5860)
        Fixed slapd-bdb/hdb with slapcat with empty dn (ITS#6006)
+       Fixed slapd-bdb/hdb with NULL transactions (ITS#6012)
        Fixed slapd-ldap incorrect referral handling (ITS#6003,ITS#5916)
        Fixed slapd-ldap/meta with broken AD results (ITS#5977)
        Fixed slapd-ldap/meta with invalid attrs again (ITS#5959)

diff --git a/servers/slapd/back-bdb/cache.c b/servers/slapd/back-bdb/cache.c
index 671e36b2e7983b44fb3ddce5eff5e16ea71e20d5..7cd34038b1f2f2c047742fc170890af6e873943c 100644 (file)
--- a/servers/slapd/back-bdb/cache.c
+++ b/servers/slapd/back-bdb/cache.c
@@ -1482,7 +1482,7 @@ bdb_reader_free( void *key, void *data )
        /* DB_ENV *env = key; */
        DB_TXN *txn = data;
 
-       TXN_ABORT( txn );
+       if ( txn ) TXN_ABORT( txn );
 }
 
 /* free up any keys used by the main thread */