lavapipe: fix a leak on a lvp_image_create exit path

This traces back to c688f8f8c5, but the
shape of the fix would be different if against that. So we do the
optimal for the current code flow and only port to stable.

Cc: mesa-stable
Reviewed-by: Lucas Fryzek <lfryzek@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36335>
(cherry picked from commit 16e3293c31)
This commit is contained in:
Yiwei Zhang 2025-07-22 23:30:18 -07:00 committed by Eric Engestrom
parent b187952593
commit 8dcc262311
2 changed files with 5 additions and 3 deletions

View file

@ -2064,7 +2064,7 @@
"description": "lavapipe: fix a leak on a lvp_image_create exit path",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

View file

@ -184,8 +184,10 @@ lvp_image_create(VkDevice _device,
&template,
&image->planes[p].size);
}
if (!image->planes[p].bo)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
if (!image->planes[p].bo) {
result = vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
goto fail;
}
image->planes[p].size = align64(image->planes[p].size, image->alignment);