Skip to content

ws: do not export a stale buffer on a commit without attach #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mirko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ws: do not export a stale buffer on a commit without attach #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/ws-egl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,20 @@ void ImplEGL::surfaceCommit(Surface& surface)
struct wl_resource* bufferResource = surface.bufferResource;
surface.bufferResource = nullptr;

if (surface.dmabufBuffer)
surface.apiClient->exportLinuxDmabuf(surface.dmabufBuffer);
else if (surface.shmBuffer)
surface.apiClient->exportShmBuffer(bufferResource, surface.shmBuffer);
// Consume the buffer state (see ws-shm.cpp): stale dmabuf/shm pointers
// must never be re-exported on a commit without a fresh attach.
const struct linux_dmabuf_buffer* dmabufBuffer = surface.dmabufBuffer;
surface.dmabufBuffer = nullptr;
struct wl_shm_buffer* shmBuffer = surface.shmBuffer;
surface.shmBuffer = nullptr;

if (!bufferResource)
return;

if (dmabufBuffer)
surface.apiClient->exportLinuxDmabuf(dmabufBuffer);
else if (shmBuffer)
surface.apiClient->exportShmBuffer(bufferResource, shmBuffer);
else
surface.apiClient->exportBufferResource(bufferResource);
}
Expand Down
15 changes: 13 additions & 2 deletions src/ws-shm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,19 @@ void ImplSHM::surfaceCommit(Surface& surface)
struct wl_resource* bufferResource = surface.bufferResource;
surface.bufferResource = nullptr;

if (surface.shmBuffer)
surface.apiClient->exportShmBuffer(bufferResource, surface.shmBuffer);
// Consume the buffer state: it belongs to the buffer attached for THIS
// commit. Leaving it set would re-export a stale - and, once the client
// destroyed the released buffer, dangling - pointer on a commit that
// did not attach a new buffer (e.g. a commit issued only for
// frame-callback pacing), handing the embedder garbage metadata.
struct wl_shm_buffer* shmBuffer = surface.shmBuffer;
surface.shmBuffer = nullptr;

if (!bufferResource)
return;

if (shmBuffer)
surface.apiClient->exportShmBuffer(bufferResource, shmBuffer);
else
surface.apiClient->exportBufferResource(bufferResource);
}
Expand Down