diff options
| author | Jason Ekstrand <jason@jlekstrand.net> | 2020-03-02 17:26:43 -0600 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-03-10 18:40:48 +0100 |
| commit | 155a550c60e9fc65154f546dfc8f0315a52c7f05 (patch) | |
| tree | 1f7bd38a68dedadef62db83aa4ac6e0af3a5d8db | |
| parent | 7daa262486aa266e039e344f8ff66177714fcfb7 (diff) | |
vulkan/wsi: Return an error if dup() fails
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4135>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4135>
(cherry picked from commit af68b0d3460259b4d9255c36f31381059e482019)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/vulkan/wsi/wsi_common.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 50c7863d733..77ac3f44ff8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -22,7 +22,7 @@ "description": "vulkan/wsi: Return an error if dup() fails", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c index c278d5d1347..8d6654cb47d 100644 --- a/src/vulkan/wsi/wsi_common.c +++ b/src/vulkan/wsi/wsi_common.c @@ -622,6 +622,7 @@ wsi_create_native_image(const struct wsi_swapchain *chain, for (uint32_t i = 0; i < p; i++) close(image->fds[p]); + result = VK_ERROR_OUT_OF_HOST_MEMORY; goto fail; } } |