From: Howard Chu <hyc@openldap.org>
Date: Fri, 2 May 2003 13:38:16 +0000 (+0000)
Subject: ITS#2480 uninit'd vars
X-Git-Tag: OPENLDAP_REL_ENG_2_2_0ALPHA~176
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2d5d4ecffa62a2e4de433db935ed3691877c88eb;p=openldap

ITS#2480 uninit'd vars
---

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index ad44e858ac..6ed4548730 100644
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -126,6 +126,8 @@ retry:	/* transaction retry */
 		eip = ei->bei_parent;
 		bdb_cache_find_id( op->o_bd, ltid, eip->bei_id, &eip,
 			0, locker, &plock, op->o_tmpmemctx );
+	} else {
+		matched = ei->bei_e;
 	}
 	if ( eip ) {
 		p = eip->bei_e;
diff --git a/servers/slapd/back-bdb/id2entry.c b/servers/slapd/back-bdb/id2entry.c
index 492af33d7c..b758769eb9 100644
--- a/servers/slapd/back-bdb/id2entry.c
+++ b/servers/slapd/back-bdb/id2entry.c
@@ -232,7 +232,7 @@ int bdb_entry_get(
 	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	struct bdb_op_info *boi = NULL;
 	DB_TXN *txn = NULL;
-	Entry *e;
+	Entry *e = NULL;
 	EntryInfo *ei;
 	int	rc;
 	const char *at_name = at->ad_cname.bv_val;
diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index b133362557..fc370f8b08 100644
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -107,7 +107,7 @@ ID bdb_tool_entry_next(
 Entry* bdb_tool_entry_get( BackendDB *be, ID id )
 {
 	int rc;
-	Entry *e;
+	Entry *e = NULL;
 	struct berval bv;
 
 	assert( be != NULL );