Skip to content

Commit fed926d

Browse files
committed
wayland/dma-buf: Handle getting dma-buf from detached buffer handle
We might still have a MetaWaylandBuffer for a wl_buffer that was destroyed. Handle trying to fetch the MetaWaylandDmaBufBuffer from such a buffer gracefully. Original Mutter commit: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/798/diffs?commit_id=4b1805c3065eea293aefb1e3d1dc0ba685bcc1fc
1 parent aad8643 commit fed926d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/wayland/meta-wayland-dma-buf.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,12 @@ static const struct wl_buffer_interface dma_buf_buffer_impl =
288288
MetaWaylandDmaBufBuffer *
289289
meta_wayland_dma_buf_from_buffer (MetaWaylandBuffer *buffer)
290290
{
291+
if (!buffer->resource)
292+
return NULL;
293+
291294
if (wl_resource_instance_of (buffer->resource, &wl_buffer_interface,
292295
&dma_buf_buffer_impl))
293-
return wl_resource_get_user_data (buffer->resource);
296+
return wl_resource_get_user_data (buffer->resource);
294297

295298
return NULL;
296299
}

0 commit comments

Comments
 (0)