s3/lib/dwrap: clang: Fix 'Array access results in a null pointer dereference'
authorNoel Power <noel.power@suse.com>
Wed, 10 Jul 2019 14:55:48 +0000 (15:55 +0100)
committerGary Lockyer <gary@samba.org>
Tue, 16 Jul 2019 22:52:24 +0000 (22:52 +0000)
Fixes:

source3/lib/dbwrap/dbwrap_watch.c:55:3: warning: Array access (from variable 'wkey') results in a null pointer dereference <--[clang]
                SIVAL(wkey, 0, db_id_len);
                ^
1 warning generated.

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
source3/lib/dbwrap/dbwrap_watch.c

index 9bf3d372621bbd6ad186aa10f7a9fec3d7f72ae2..6bbd68df8595ff4c7f59bc0b4620a160abf34816 100644 (file)
@@ -51,7 +51,7 @@ static ssize_t dbwrap_record_watchers_key(struct db_context *db,
                return -1;
        }
 
-       if (wkey_len >= needed) {
+       if (wkey != NULL && wkey_len >= needed) {
                SIVAL(wkey, 0, db_id_len);
                memcpy(wkey + sizeof(uint32_t), db_id, db_id_len);
                memcpy(wkey + sizeof(uint32_t) + db_id_len,