X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fat.c;h=b28ebc3484533396a7b5a5069e2f9990a30bbd35;hb=00b26076d4de59e28c4794930f69990432707f0e;hp=67537420db30ab54a9076a660b251106a9827b1f;hpb=15ff195b218b345592c561f92c9406bf96e56d6a;p=openldap

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 67537420db..b28ebc3484 100644
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
+ * Copyright 1998-2017 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -365,6 +365,10 @@ at_next( AttributeType **at )
 	}
 #endif
 
+	if ( *at == NULL ) {
+		return 0;
+	}
+
 	*at = LDAP_STAILQ_NEXT(*at,sat_next);
 
 	return (*at != NULL);