From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 14 Apr 2008 20:53:16 +0000 (+0000)
Subject: ITS#5388
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~106
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2593de37162a38f6ab9096a36338bb1ef54642ce;p=openldap

ITS#5388
---

diff --git a/CHANGES b/CHANGES
index 262f1afff4..7a1f3ad4e8 100644
--- 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 8f1bd67ebc..0dd04d75c7 100644
--- 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);