X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fat.c;h=3621763a70e3494fca42e61b855f1ab0dfabef1f;hb=434c306cbefeafe40f638ed3df93d630c996f9e5;hp=67537420db30ab54a9076a660b251106a9827b1f;hpb=5c878c1bf24e0f2b558cbbe59ffebe53819e49ed;p=openldap

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 67537420db..3621763a70 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);
@@ -655,7 +659,7 @@ at_add(
 	*err = cname;
 
 	if ( !at->at_usage && at->at_no_user_mod ) {
-		/* user attribute must be modifable */
+		/* user attribute must be modifiable */
 		code = SLAP_SCHERR_ATTR_BAD_USAGE;
 		goto error_return;
 	}
@@ -721,7 +725,7 @@ at_add(
 	/*
 	 * Inherit definitions from superiors.  We only check the
 	 * direct superior since that one has already inherited from
-	 * its own superiorss
+	 * its own superiors
 	 */
 	if ( sat->sat_sup ) {
 		Syntax *syn = syn_find(sat->sat_sup->sat_syntax->ssyn_oid);