OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wsi: Make sure to return a valid wayland id string

Browse Source 
The result of asprintf was previously ignored, handle the case of failure by
not returning undefined content.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29724>
This commit is contained in:
Corentin Noël
2024-06-14 11:16:56 +02:00
committed by Marge Bot
parent b7982152ff
commit 8c5c93acba
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vulkan/wsi/wsi_common_wayland.c
View File

@@ -242,7 +242,9 @@ stringify_wayland_id(uint32_t id)
{
char *out;
asprintf(&out, "wl%d", id);
if (asprintf(&out, "wl%d", id) < 0)
return NULL;
return out;
}
@@ -1991,7 +1993,7 @@ trace_present(const struct wsi_wl_present_id *id,
/* Close the previous image display interval first, if there is one. */
if (surface->analytics.presenting && util_perfetto_is_tracing_enabled()) {
buffer_name = stringify_wayland_id(surface->analytics.presenting);
MESA_TRACE_TIMESTAMP_END(buffer_name,
MESA_TRACE_TIMESTAMP_END(buffer_name ? buffer_name : "Wayland buffer",
surface->analytics.presentation_track_id,
presentation_time);
free(buffer_name);
@@ -2001,7 +2003,7 @@ trace_present(const struct wsi_wl_present_id *id,
if (util_perfetto_is_tracing_enabled()) {
buffer_name = stringify_wayland_id(id->buffer_id);
MESA_TRACE_TIMESTAMP_BEGIN(buffer_name,
MESA_TRACE_TIMESTAMP_BEGIN(buffer_name ? buffer_name : "Wayland buffer",
surface->analytics.presentation_track_id,
id->flow_id,
presentation_time);