diff options
| author | Iván Briano <ivan.briano@intel.com> | 2022-04-29 14:54:46 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-05-03 09:41:32 -0700 |
| commit | d9083cff8e793766dd6e8e727e58e1cece471b16 (patch) | |
| tree | d5801ff48d57c9f350bb46f4ccc57562afea4735 /.pick_status.json | |
| parent | 52ab0ca9b0c20a0db467fa2799cf8d50020a2416 (diff) | |
vulkan/wsi/wayland: Fix double free on error condition
If wsi_configure_native_image() fails, it will call
wsi_destroy_image_info() itself, so let's try to not call it again from
wsi_wl_swapchain_destroy().
Fixes the CTS tests:
dEQP-VK.wsi.wayland.swapchain.simulate_oom.*
Fixes: b626a5be43d ("vulkan/wsi/wayland: Split image creation")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16257>
(cherry picked from commit bf04be17f7f7cb41ef90176a8bc1fad587206046)
Diffstat (limited to '.pick_status.json')
| -rw-r--r-- | .pick_status.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 64c222f7be3..e7a18e781ac 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -427,7 +427,7 @@ "description": "vulkan/wsi/wayland: Fix double free on error condition", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "b626a5be43d4cd81d6f6e7c17eef8f9055f555d7" }, |