[Pkg-openldap-devel] [openldap] 17/33: ITS#8199 fix NULL ptr dereference in at_next

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit d4e9bcb0d9a0cac3f99751fffcf348579ba52d8f
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Fri Jul 17 15:46:32 2015 -0700

    ITS#8199 fix NULL ptr dereference in at_next
    
    Deleting all values of olcAttributeTypes and then adding a value with
    index > 0 triggers a NULL dereference when config_generic tries to
    append to a list that doesn't exist yet.
    
    Already fixed for olcObjectClasses in ITS#5388.
---
 servers/slapd/at.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index c4d65cf..d361d91 100644
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -365,6 +365,10 @@ at_next( AttributeType **at )
 	}
 #endif
 
+	if ( *at == NULL ) {
+		return 0;
+	}
+
 	*at = LDAP_STAILQ_NEXT(*at,sat_next);
 
 	return (*at != NULL);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git