Conor McCarthy : vkd3d: Prevent a null pointer dereference when a descriptor is not a UAV.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 6b893b597bd4a3c51cbd992a5bef55b3b676e3ed
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b893b597bd4a3c51cbd992a5bef55b3b676e3ed

Author: Conor McCarthy <cmccarthy at codeweavers.com>
Date:   Sat Apr 23 16:42:48 2022 +1000

vkd3d: Prevent a null pointer dereference when a descriptor is not a UAV.

Fixes crashes in Shadow of the Tomb Raider, GRID 2019 and probably others.

Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/vkd3d/device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 0b643727..1522065f 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -3653,7 +3653,7 @@ static void d3d12_desc_buffered_copy_atomic(struct d3d12_desc *dst, const struct
     vkd3d_mutex_unlock(mutex);
 
     infos[set].uav_counter |= (location->src.magic == VKD3D_DESCRIPTOR_MAGIC_UAV)
-            & !!location->src.u.view_info.view->vk_counter_view;
+            && !!location->src.u.view_info.view->vk_counter_view;
     location->dst = dst;
 
     if (infos[set].count == ARRAY_SIZE(locations[0]))