From: Jan Synacek <jsynacek@redhat.com>
Date: Mon, 26 Nov 2012 21:49:14 +0000 (-0800)
Subject: ITS#7431 fix constraint_check_restrict segfault
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3c196813724a4da75c173e4ced4c697e697d8319;p=openldap

ITS#7431 fix constraint_check_restrict segfault
---

diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c
index ee8911bd40..f2c645c609 100644
--- a/servers/slapd/overlays/constraint.c
+++ b/servers/slapd/overlays/constraint.c
@@ -935,10 +935,6 @@ constraint_update( Operation *op, SlapReply *rs )
 
 	/* Do we need to count attributes? */
 	for(cp = c; cp; cp = cp->ap_next) {
-		if (cp->restrict_lud && constraint_check_restrict(op, cp, target_entry) == 0) {
-			continue;
-		}
-
 		if (cp->count != 0) {
 			if (rc != 0 || target_entry == NULL) {
 				Debug(LDAP_DEBUG_TRACE, 
@@ -950,6 +946,10 @@ constraint_update( Operation *op, SlapReply *rs )
 				goto mod_violation;
 			}
 
+			if (cp->restrict_lud && constraint_check_restrict(op, cp, target_entry) == 0) {
+				continue;
+			}
+
 			is_v = constraint_check_count_violation(m, target_entry, cp);
 
 			Debug(LDAP_DEBUG_TRACE,