Merge eb96b4aad5 into ac10768495

Wayland: Fix memory leaks in data offer reading
The buffer storing the contents of the data offer being read could leak if buffer reallocation or reading from the pipe failed.
2025-12-20 14:11:55 +00:00 · 2025-07-30 08:13:59 +08:00 · 2025-07-18 12:31:07 +02:00 · 2025-07-17 17:24:19 +02:00 · 2024-11-22 05:59:44 +00:00 · 2024-11-22 05:50:28 +00:00
6 changed files with 19 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -132,6 +132,8 @@ information on what to include when reporting a bug.
 - [Wayland] Bugfix: `glfwInit` would segfault on compositor with no seat (#2517)
 - [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`
--- a/examples/particles.c
+++ b/examples/particles.c
@ -24,6 +24,8 @@
 //
 //========================================================================

+#define _GNU_SOURCE
+
 #if defined(_MSC_VER)
 // Make MS math.h define M_PI
 #define _USE_MATH_DEFINES
--- a/src/linux_joystick.c
+++ b/src/linux_joystick.c
@ -25,6 +25,8 @@
 //
 //========================================================================

+#define _GNU_SOURCE
+
 #include "internal.h"

 #if defined(GLFW_BUILD_LINUX_JOYSTICK)
--- a/src/posix_time.c
+++ b/src/posix_time.c
@ -25,6 +25,8 @@
 //
 //========================================================================

+#define _GNU_SOURCE
+
 #include "internal.h"

 #if defined(GLFW_BUILD_POSIX_TIMER)
--- a/src/wl_init.c
+++ b/src/wl_init.c
@ -24,6 +24,8 @@
 //
 //========================================================================

+#define _GNU_SOURCE
+
 #include "internal.h"

 #if defined(_GLFW_WAYLAND)
--- a/src/wl_window.c
+++ b/src/wl_window.c
@ -40,7 +40,9 @@
 #include <sys/mman.h>
 #include <sys/timerfd.h>
 #include <poll.h>
+#if __has_include(<linux/input-event-codes.h>)
 #include <linux/input-event-codes.h>
+#endif

 #include "wayland-client-protocol.h"
 #include "xdg-shell-client-protocol.h"
@ -1333,6 +1335,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 +1355,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;
        }
@ -2187,7 +2191,12 @@ void _glfwDestroyWindowWayland(_GLFWwindow* window)
        _glfw.wl.pointerFocus = NULL;

    if (window == _glfw.wl.keyboardFocus)
+	{
+		struct itimerspec timer = {0};
+		timerfd_settime(_glfw.wl.keyRepeatTimerfd, 0, &timer, NULL);
+
        _glfw.wl.keyboardFocus = NULL;
+	}

    if (window->wl.fractionalScale)
        wp_fractional_scale_v1_destroy(window->wl.fractionalScale);
Author	SHA1	Message	Date
WillyJL	b4751f7445	Merge `eb96b4aad5` into `ac10768495`	2025-07-30 08:13:59 +08:00
Camilla Löwy	ac10768495	Wayland: Fix memory leaks in data offer reading The buffer storing the contents of the data offer being read could leak if buffer reallocation or reading from the pipe failed.	2025-07-18 12:31:07 +02:00
Doug Binks	feb2a6b728	Wayland: Reset key repeat timer on window destruction Windows with keyboard focus may have an active key repeat timer. This should be reset when the window is closed, or key repeat events could be sent to a NULL window were it not for the quickfix in PR #2732. Fixes #2741 Probably the source of #2727	2025-07-17 17:24:19 +02:00
Willy-JL	eb96b4aad5	Last missing `_GNU_SOURCE`	2024-11-22 05:59:44 +00:00
Willy-JL	80b7713126	Fix `linux/input-event-codes.h` when not present	2024-11-22 05:50:28 +00:00
Willy-JL	e3b41e1cf1	Fix `time.h` includes missing `_GNU_SOURCE`	2024-11-22 05:44:51 +00:00