Merge 3fe235fb56 into 936307558e

X11: Clamp w,h in glfwSetWindowSize to >= 1
- prevents BadValue error and program exit
2025-12-19 13:41:54 +00:00 · 2025-11-11 10:20:25 +01:00 · 2025-11-08 10:37:52 +00:00 · 2025-11-07 17:39:26 +00:00 · 2025-11-07 17:24:35 +00:00
4 changed files with 19 additions and 0 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -282,10 +282,12 @@ video tutorials.
 - Corentin Wallez
 - Torsten Walluhn
 - Patrick Walton
+ - Ivor Wanders
 - Jim Wang
 - Xo Wang
 - Andre Weissflog
 - Jay Weisskopf
+ - Drew Weymouth
 - Frank Wille
 - Andy Williams
 - Joel Winarske
--- a/README.md
+++ b/README.md
@ -145,6 +145,10 @@ information on what to include when reporting a bug.
 - [Wayland] Bugfix: The cursor position was not updated when clicking through
   from a modal to the content area
 - [X11] Bugfix: Running without a WM could trigger an assert (#2593,#2601,#2631)
+ - [X11] Bugfix: Occasional crash when an idle display awakes (#2766) 
+ - [X11] Bugfix: Prevent BadWindow when creating small windows with a content scale
+   less than 1 (#2754)
+ - [X11] Bugfix: Clamp width and height to >= 1 to prevent BadValue error and app exit
 - [Null] Added Vulkan 'window' surface creation via `VK_EXT_headless_surface`
 - [Null] Added EGL context creation on Mesa via `EGL_MESA_platform_surfaceless`
 - [EGL] Allowed native access on Wayland with `GLFW_CONTEXT_CREATION_API` set to
--- a/src/x11_monitor.c
+++ b/src/x11_monitor.c
@ -151,6 +151,11 @@ void _glfwPollMonitorsX11(void)
            }

            XRRCrtcInfo* ci = XRRGetCrtcInfo(_glfw.x11.display, sr, oi->crtc);
+            if (!ci) {
+                XRRFreeOutputInfo(oi);
+                continue;
+            }
+
            if (ci->rotation == RR_Rotate_90 || ci->rotation == RR_Rotate_270)
            {
                widthMM  = oi->mm_height;
--- a/src/x11_window.c
+++ b/src/x11_window.c
@ -576,6 +576,10 @@ static GLFWbool createNativeWindow(_GLFWwindow* window,
        height *= _glfw.x11.contentScaleY;
    }

+    // The dimensions must be nonzero, or a BadValue error results.
+    width = _glfw_max(1, width);
+    height = _glfw_max(1, height);
+
    int xpos = 0, ypos = 0;

    if (wndconfig->xpos != GLFW_ANY_POSITION && wndconfig->ypos != GLFW_ANY_POSITION)
@ -2203,6 +2207,10 @@ void _glfwGetWindowSizeX11(_GLFWwindow* window, int* width, int* height)

 void _glfwSetWindowSizeX11(_GLFWwindow* window, int width, int height)
 {
+	// The dimensions must be nonzero, or a BadValue error results.
+    width = _glfw_max(1, width);
+    height = _glfw_max(1, height);
+	
    if (window->monitor)
    {
        if (window->monitor->window == window)
Author	SHA1	Message	Date
Sebastian Dawid	0a659ca4c5	Merge `3fe235fb56` into `936307558e`	2025-11-11 10:20:25 +01:00
Doug Binks	936307558e	X11: Clamp w,h in glfwSetWindowSize to >= 1 - prevents BadValue error and program exit	2025-11-08 10:37:52 +00:00
Drew Weymouth	4df5129529	X11: check crtcInfo for NULL when polling monitors	2025-11-07 17:39:26 +00:00
Ivor Wanders	6de70d8252	X11: Prevent BadWindow when creating small windows The glfwCreateWindow function ensures that the width and height are at least greater or equal than zero, but on X11 it is invalid to create a window with dimensions that equal zero, see [1]. This change ensures that the dimensions passed to XCreateWindow are at least 1 by 1. This issue was detected in [2], where a call to glfwCreateWindow was done to request a 1x1 window, with a _glfw.x11.contentScaleX of less than 1.0 (0.958333) this results in a request for a 0x0 window which then causes an BadWindow error from X11. [1]: `e003f52661/specs/libX11/CH03.xml (L1333-1337)` [2]: https://github.com/WerWolv/ImHex/pull/2390	2025-11-07 17:24:35 +00:00