From c76107ab89cad1d02bc76ed4fafd8defe33bf0cb Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Sun, 20 Jul 2025 22:19:08 -0700 Subject: [PATCH] lavapipe: amend missing object finish on mem alloc failure Missed since it was still vallium. Cc: mesa-stable Reviewed-by: Konstantin Seurer Part-of: (cherry picked from commit 44e6f0abaabb3804a5536bfdebe9c7e06891999a) --- .pick_status.json | 2 +- src/gallium/frontends/lavapipe/lvp_device.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 9665bcfba8c..4e1325033e3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1234,7 +1234,7 @@ "description": "lavapipe: amend missing object finish on mem alloc failure", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index f2ca1d16c9b..f16a996febf 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -2101,6 +2101,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_AllocateMemory( return VK_SUCCESS; fail: + vk_object_base_finish(&mem->base); vk_free2(&device->vk.alloc, pAllocator, mem); return vk_error(device, error); }