From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 4 Sep 2007 02:38:34 +0000 (+0000)
Subject: make sure n,o are non-zero, so j is initialized (coverity)
X-Git-Tag: OPENLDAP_REL_ENG_2_4_5BETA~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=22c18d0c444f7c03ec95d5b4a6c508f2ddec0a87;p=openldap

make sure n,o are non-zero, so j is initialized (coverity)
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index af5b81d446..db87e5205c 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -2695,6 +2695,11 @@ attr_cmp( Operation *op, Attribute *old, Attribute *new,
 		for ( o=0; old->a_vals[o].bv_val; o++ ) ;
 		for ( n=0; new->a_vals[n].bv_val; n++ ) ;
 
+		/* there MUST be both onld and new values
+		 * (otherwise j is used uninitialized) */
+		assert( o != 0 );
+		assert( n != 0 );
+
 		adds = op->o_tmpalloc( sizeof(struct berval *) * n, op->o_tmpmemctx );
 		dels = op->o_tmpalloc( sizeof(struct berval *) * o, op->o_tmpmemctx );