Merge baf3290308 into ac10768495

The buffer storing the contents of the data offer being read could leak
if buffer reallocation or reading from the pipe failed.

README.md

@@ -133,6 +133,7 @@ information on what to include when reporting a bug.
  - [Wayland] Bugfix: A drag entering a non-GLFW surface could cause a segfault
  - [Wayland] Bugfix: Ignore key repeat events when no window has keyboard focus (#2727)
  - [Wayland] Bugfix: Reset key repeat timer when window destroyed (#2741,#2727)
+ - [Wayland] Bugfix: Memory would leak if reading a data offer failed midway
  - [X11] Bugfix: Running without a WM could trigger an assert (#2593,#2601,#2631)
  - [Null] Added Vulkan 'window' surface creation via `VK_EXT_headless_surface`
  - [Null] Added EGL context creation on Mesa via `EGL_MESA_platform_surfaceless`

src/wl_init.c

@@ -518,7 +518,12 @@ GLFWbool _glfwConnectWayland(int platformID, _GLFWplatform* platform)
         .createWindowSurface = _glfwCreateWindowSurfaceWayland
     };
 
-    void* module = _glfwPlatformLoadModule("libwayland-client.so.0");
+    void* module;
+#if defined(__OpenBSD__)
+    module = _glfwPlatformLoadModule("libwayland-client.so");
+#else
+    module = _glfwPlatformLoadModule("libwayland-client.so.0");
+#endif
     if (!module)
     {
         if (platformID == GLFW_PLATFORM_WAYLAND)
@@ -631,7 +636,11 @@ int _glfwInitWayland(void)
         return GLFW_FALSE;
     }
 
+#if defined(__OpenBSD__)
+    _glfw.wl.cursor.handle = _glfwPlatformLoadModule("libwayland-cursor.so");
+#else
     _glfw.wl.cursor.handle = _glfwPlatformLoadModule("libwayland-cursor.so.0");
+#endif
     if (!_glfw.wl.cursor.handle)
     {
         _glfwInputError(GLFW_PLATFORM_ERROR,
@@ -648,7 +657,11 @@ int _glfwInitWayland(void)
     _glfw.wl.cursor.image_get_buffer = (PFN_wl_cursor_image_get_buffer)
         _glfwPlatformGetModuleSymbol(_glfw.wl.cursor.handle, "wl_cursor_image_get_buffer");
 
+#if defined(__OpenBSD__)
+    _glfw.wl.egl.handle = _glfwPlatformLoadModule("libwayland-egl.so");
+#else
     _glfw.wl.egl.handle = _glfwPlatformLoadModule("libwayland-egl.so.1");
+#endif
     if (!_glfw.wl.egl.handle)
     {
         _glfwInputError(GLFW_PLATFORM_ERROR,
@@ -663,7 +676,11 @@ int _glfwInitWayland(void)
     _glfw.wl.egl.window_resize = (PFN_wl_egl_window_resize)
         _glfwPlatformGetModuleSymbol(_glfw.wl.egl.handle, "wl_egl_window_resize");
 
+#if defined(__OpenBSD__)
+    _glfw.wl.xkb.handle = _glfwPlatformLoadModule("libxkbcommon.so");
+#else
     _glfw.wl.xkb.handle = _glfwPlatformLoadModule("libxkbcommon.so.0");
+#endif
     if (!_glfw.wl.xkb.handle)
     {
         _glfwInputError(GLFW_PLATFORM_ERROR,
@@ -743,7 +760,11 @@ int _glfwInitWayland(void)
     }
 
     if (_glfw.hints.init.wl.libdecorMode == GLFW_WAYLAND_PREFER_LIBDECOR)
+#if defined(__OpenBSD__)
+        _glfw.wl.libdecor.handle = _glfwPlatformLoadModule("libdecor-0.so");
+#else
         _glfw.wl.libdecor.handle = _glfwPlatformLoadModule("libdecor-0.so.0");
+#endif
 
     if (_glfw.wl.libdecor.handle)
     {

src/wl_window.c

@@ -1333,6 +1333,7 @@ static char* readDataOfferAsString(struct wl_data_offer* offer, const char* mime
             if (!longer)
             {
                 _glfwInputError(GLFW_OUT_OF_MEMORY, NULL);
+                _glfw_free(string);
                 close(fds[0]);
                 return NULL;
             }
@@ -1352,6 +1353,7 @@ static char* readDataOfferAsString(struct wl_data_offer* offer, const char* mime
             _glfwInputError(GLFW_PLATFORM_ERROR,
                             "Wayland: Failed to read from data offer pipe: %s",
                             strerror(errno));
+            _glfw_free(string);
             close(fds[0]);
             return NULL;
         }