import re-fix of ITS#5121

diff --git a/CHANGES b/CHANGES
index fac7515d1abbbc2e6cdd1e9f1a78309513f83233..ce52381ff667e923d293998195c3ee2b167851e5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,9 +6,10 @@ OpenLDAP 2.4.6 Engineering
        Fixed slapd alock_close with Quick mode (ITS#5129)
        Fixed slapd ordered values add normalization issue (ITS#5136)
        Fixed slapd-bdb/hdb suffix logging (ITS#5128)
+       Fixed slapd-bdb/hdb IDL LRU handling (ITS#5121)
        Fixed slapd-ldap SASL idassert w/o authcId
-       Fixed slapd-meta conn caching on bind failure (ITS#5154)
        Fixed slapd-meta leak when binding as rootdn (ITS#5155)
+       Fixed slapd-meta conn caching on bind failure (ITS#5154)
        Fixed slapo-chain double-free (ITS#5137)
        Fixed slapo-dynlist entry release (ITS#5135)
        Fixed slapo-rwm modlist handling (ITS#5124)

diff --git a/servers/slapd/back-bdb/idl.c b/servers/slapd/back-bdb/idl.c
index 044f2a0d4cee1d9b78421a7d687cd7efd86f0261..dad12bf56186af7dcb28f0460e38648fdbe6d3bb 100644 (file)
--- a/servers/slapd/back-bdb/idl.c
+++ b/servers/slapd/back-bdb/idl.c
@@ -379,7 +379,7 @@ bdb_idl_cache_put(
        if ( ++bdb->bi_idl_cache_size > bdb->bi_idl_cache_max_size ) {
                int i;
                ee = bdb->bi_idl_lru_tail;
-               for ( i = 0; i < 10; i++, ee = eprev ) {
+               for ( i = 0; ee != NULL && i < 10; i++, ee = eprev ) {
                        eprev = ee->idl_lru_prev;
                        if ( eprev == ee ) {
                                eprev = NULL;