From: Noel Power <noel.power@suse.com>
Date: Fri, 14 Jun 2019 13:36:31 +0000 (+0000)
Subject: lib/dbwrap: clang: Fix 'all argument is an uninitialized value'
X-Git-Tag: ldb-2.0.5~190
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37add5c8ce705f9a2d0ab77d6ef07885d72463c7;p=thirdparty%2Fsamba.git

lib/dbwrap: clang: Fix 'all argument is an uninitialized value'

Fixes:

lib/dbwrap/dbwrap.c:533:4: warning: 2nd function call argument is an uninitialized value <--[clang]
                        dbwrap_lock_order_unlock(db, lockptr);
                        ^

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
---

diff --git a/lib/dbwrap/dbwrap.c b/lib/dbwrap/dbwrap.c
index 5e307ee47cd..29815cb07af 100644
--- a/lib/dbwrap/dbwrap.c
+++ b/lib/dbwrap/dbwrap.c
@@ -520,7 +520,7 @@ NTSTATUS dbwrap_do_locked(struct db_context *db, TDB_DATA key,
 	struct db_record *rec;
 
 	if (db->do_locked != NULL) {
-		struct db_context **lockptr;
+		struct db_context **lockptr = NULL;
 		NTSTATUS status;
 
 		if (db->lock_order != DBWRAP_LOCK_ORDER_NONE) {
@@ -529,7 +529,8 @@ NTSTATUS dbwrap_do_locked(struct db_context *db, TDB_DATA key,
 
 		status = db->do_locked(db, key, fn, private_data);
 
-		if (db->lock_order != DBWRAP_LOCK_ORDER_NONE) {
+		if (db->lock_order != DBWRAP_LOCK_ORDER_NONE &&
+		    lockptr != NULL) {
 			dbwrap_lock_order_unlock(db, lockptr);
 		}