From: Howard Chu <hyc@openldap.org>
Date: Tue, 1 Aug 2017 20:47:15 +0000 (+0100)
Subject: Cleanup uninit'd vars
X-Git-Url: https://git.sur5r.net/?p=openldap;a=commitdiff_plain;h=5bd89a1f1f1a53089cbc8ed576a3b6cc1164f671

Cleanup uninit'd vars
---

diff --git a/servers/slapd/back-mdb/modify.c b/servers/slapd/back-mdb/modify.c
index 6de49c29ef..7bfdb5cd58 100644
--- a/servers/slapd/back-mdb/modify.c
+++ b/servers/slapd/back-mdb/modify.c
@@ -329,6 +329,7 @@ do_del:
  			 */
  			mod->sm_op = LDAP_MOD_ADD;
 			softop = 1;
+			chkpresent = 0;
 			goto do_add;
 
 		case SLAP_MOD_SOFTDEL:
@@ -356,6 +357,7 @@ do_del:
  			 * We need to add index if necessary.
  			 */
  			mod->sm_op = LDAP_MOD_ADD;
+			softop = 0;
 			chkpresent = 1;
 			goto do_add;
 
diff --git a/servers/slapd/back-mdb/search.c b/servers/slapd/back-mdb/search.c
index 43442aa242..8e06326780 100644
--- a/servers/slapd/back-mdb/search.c
+++ b/servers/slapd/back-mdb/search.c
@@ -710,6 +710,7 @@ dn2entry_retry:
 	}
 
 	wwctx.flag = 0;
+	wwctx.nentries = 0;
 	/* If we're running in our own read txn */
 	if (  moi == &opinfo ) {
 		cb.sc_writewait = mdb_writewait;