ITS#5388

diff --git a/CHANGES b/CHANGES
index 262f1afff477626b0287b1750d689b3a4bb7dfbe..7a1f3ad4e80b716cf2a478888f40b401ec5da4d6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.4.9 Engineering
        Fixed slapcat error checking (ITS#5387)
        Fixed slapd frontendDB backend selection (ITS#5419)
        Fixed slapd delta-syncrepl resync (ITS#5378)
+       Fixed slapd pointer dereference (ITS#5388)
        Fixed slapd syncrepl hang on back-config (ITS#5407)
        Fixed slapd syncrepl compare_csns crash (ITS#5413)
        Fixed slapd syncrepl contextCSN update clash (ITS#5426)

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 8f1bd67ebc5107cb2ae6df5ca28ae4e729e3db00..0dd04d75c71734381e635198e671ecdec37b602c 100644 (file)
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -502,6 +502,10 @@ oc_next( ObjectClass **oc )
        }
 #endif
 
+       if ( *oc == NULL ) {
+               return 0;
+       }
+
        *oc = LDAP_STAILQ_NEXT(*oc,soc_next);
 
        return (*oc != NULL);