]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
lib/dbwrap: clang: Fix 'all argument is an uninitialized value'
authorNoel Power <noel.power@suse.com>
Fri, 14 Jun 2019 13:36:31 +0000 (13:36 +0000)
committerNoel Power <npower@samba.org>
Wed, 26 Jun 2019 10:30:23 +0000 (10:30 +0000)
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>
lib/dbwrap/dbwrap.c

index 5e307ee47cd8feecc221b2710234c8cf3853ba30..29815cb07afa0d02ec1bb8467c24d580405463d3 100644 (file)
@@ -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);
                }