]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smbd: Fix Coverity ID 1499372 Uninitialized scalar variable
authorVolker Lendecke <vl@samba.org>
Wed, 15 Nov 2023 13:53:06 +0000 (14:53 +0100)
committerJeremy Allison <jra@samba.org>
Tue, 21 Nov 2023 18:33:51 +0000 (18:33 +0000)
This is real.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Nov 21 18:33:51 UTC 2023 on atb-devel-224

source3/smbd/smb2_oplock.c

index 2fd98286a924be5d40dc66d890b2491901c51340..75d50b38f6ceb986e934fbfb0eb906024d8fb55d 100644 (file)
@@ -1379,7 +1379,10 @@ void message_to_share_mode_entry(struct file_id *id,
                                 struct share_mode_entry *e,
                                 const char *msg)
 {
-       e->pid.pid = (pid_t)IVAL(msg,OP_BREAK_MSG_PID_OFFSET);
+       e->pid = (struct server_id){
+               .pid = (pid_t)IVAL(msg, OP_BREAK_MSG_PID_OFFSET),
+               .vnn = IVAL(msg, OP_BREAK_MSG_VNN_OFFSET),
+       };
        e->op_mid = BVAL(msg,OP_BREAK_MSG_MID_OFFSET);
        e->op_type = SVAL(msg,OP_BREAK_MSG_OP_TYPE_OFFSET);
        e->access_mask = IVAL(msg,OP_BREAK_MSG_ACCESS_MASK_OFFSET);
@@ -1395,8 +1398,7 @@ void message_to_share_mode_entry(struct file_id *id,
        e->share_file_id = (unsigned long)IVAL(msg,OP_BREAK_MSG_FILE_ID_OFFSET);
        e->uid = (uint32_t)IVAL(msg,OP_BREAK_MSG_UID_OFFSET);
        e->flags = (uint16_t)SVAL(msg,OP_BREAK_MSG_FLAGS_OFFSET);
-       e->name_hash = IVAL(msg,OP_BREAK_MSG_NAME_HASH_OFFSET);
-       e->pid.vnn = IVAL(msg,OP_BREAK_MSG_VNN_OFFSET);
+       e->name_hash = IVAL(msg, OP_BREAK_MSG_NAME_HASH_OFFSET);
 }
 
 /****************************************************************************