ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit bd148df8221f798463e060c66a2b7311c0778353
Author: Nathan Kinder <nkinder(a)redhat.com>
Date: Tue Mar 15 14:35:58 2011 -0700
Bug 687974 - (cov#10715) Fix Coverity uninitialized variables issues
The ldif2ldbm code can return an uninitialized integer if it runs
into a problem starting the dblayer to get the next USN. This block
of code should use the ret variable to capture the result of starting
the dblayer to ensure it is set before it gets returned.
diff --git a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
index fd7934a..cf0f539 100644
--- a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
+++ b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
@@ -708,21 +708,21 @@ int ldbm_back_ldif2ldbm( Slapi_PBlock *pb )
* initialize the USN counter to get the next USN */
if (plugin_enabled("USN", li->li_identity)) {
/* close immediately; no need to run db threads */
- int rc = dblayer_start(li,
+ ret = dblayer_start(li,
DBLAYER_NORMAL_MODE|DBLAYER_NO_DBTHREADS_MODE);
- if (rc) {
+ if (ret) {
LDAPDebug2Args(LDAP_DEBUG_ANY,
"ldbm_back_ldif2ldbm: dblayer_start failed! %s (%d)\n",
- dblayer_strerror(rc), rc);
+ dblayer_strerror(ret), ret);
goto fail;
}
/* initialize the USN counter */
ldbm_usn_init(li);
- rc = dblayer_close(li, DBLAYER_NORMAL_MODE);
- if (rc) {
+ ret = dblayer_close(li, DBLAYER_NORMAL_MODE);
+ if (ret != 0) {
LDAPDebug2Args(LDAP_DEBUG_ANY,
"ldbm_back_ldif2ldbm: dblayer_close failed! %s (%d)\n",
- dblayer_strerror(rc), rc);
+ dblayer_strerror(ret), ret);
}
}
Show replies by date