From 82c69995f0b482e2c86807f66a43358aef91edf5 Mon Sep 17 00:00:00 2001
From: Colin Kinloch <colin@kinlo.ch>
Date: Sat, 19 Mar 2022 16:22:51 +0000
Subject: [PATCH] (Wayland) SHM anti-collision for the splash screen

---
 input/common/wayland_common.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/input/common/wayland_common.c b/input/common/wayland_common.c
index 4dcea829b9..6f22678dab 100644
--- a/input/common/wayland_common.c
+++ b/input/common/wayland_common.c
@@ -47,7 +47,7 @@
 #define IOR_WRITE 0x2
 #define IOR_NO_RETRY 0x4
 
-#define SPLASH_SHM_NAME "retroarch-wayland-vk-splash"
+#define SPLASH_SHM_NAME "retroarch-wayland-splash"
 
 static void keyboard_handle_keymap(void* data,
       struct wl_keyboard* keyboard,
@@ -1008,8 +1008,21 @@ int create_shm_file(off_t size)
    if (fd < 0)
    #endif
    {
-      fd = shm_open(SPLASH_SHM_NAME, O_RDWR | O_CREAT, 0660);
-      ftruncate(fd, size);
+      for (unsigned retry_count = 0; retry_count < 100; retry_count++)
+      {
+         char *name;
+         if (asprintf (&name, "%s-%02d", SPLASH_SHM_NAME, retry_count) < 0)
+            continue;
+         fd = shm_open(name, O_RDWR | O_CREAT, 0600);
+         if (fd >= 0)
+         {
+            shm_unlink(name);
+            free(name);
+            ftruncate(fd, size);
+            break;
+         }
+         free(name);
+      }
    }
 
    return fd;
@@ -1052,7 +1065,7 @@ shm_buffer_t *create_shm_buffer(gfx_ctx_wayland_data_t *wl, int width,
       stride, format);
    wl_buffer_add_listener(buffer->wl_buffer, &shm_buffer_listener, buffer);
    wl_shm_pool_destroy(pool);
-   shm_unlink(SPLASH_SHM_NAME);
+
    close(fd);
 
    buffer->data = data;