[repo.or.cz] wmaker-crm.git branch master updated: wmaker-0.96.0-108-g6c107e0ce53f

[crmafra]

This is an automated email generated because a ref change occurred in the
git repository for project wmaker-crm.git.

The branch, master has been updated
via 6c107e0ce53fc5cd3779afb6ce679fb8028974f9 (commit)
via 7c80e917d7c5e665c779dcbde9f3559e84d57c12 (commit)
from 90ce10998cd1d9bf8970796d2dae7ca0200ef03e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6c107e0ce53fc5cd3779afb6ce679fb8028974f9
Author: Haroldo Santos <haroldo...@gmail.com>
Date: Mon, 15 Jun 2026 08:20:24 -0400
URL: <https://repo.or.cz/wmaker-crm.git/6c107e0ce53fc5cd>

wmsetbg: fix "X connection broken" crash when setting background

setPixmapProperty() called XKillClient(dpy, old_pixmap) to free the
previous background pixmap stored in _XROOTPMAP_ID. The pixmap was
created by duplicatePixmap() via a short-lived second X connection
that used XSetCloseDownMode(RetainPermanent). After that connection
closed, the X server eventually recycled its client ID for a new
connection. If wmsetbg's own 'dpy' connection received that recycled
ID, XKillClient() would kill wmsetbg itself, causing the fatal error:

X connection to :0 broken (explicit kill or server shutdown).

Fix by switching from RetainPermanent to RetainTemporary in
duplicatePixmap(). With RetainTemporary, background pixmaps are kept
alive for the lifetime of the X session and freed automatically at
logout — no explicit XKillClient() is needed.

Remove the now-dead XKillClient() block from setPixmapProperty():
- dummyErrorHandler() was only used to suppress its X errors; remove.
- The mode variable toggled PropModeReplace/PropModeAppend based on
whether an old pixmap was present; since we always want to replace,
use PropModeReplace unconditionally.

Co-authored-by: Copilot <22355621...@users.noreply.github.com>
---
util/wmsetbg.c | 39 ++++++++++++++++-----------------------
1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/util/wmsetbg.c b/util/wmsetbg.c
index 5e75ca0e9f41..4f697d4909a9 100644
--- a/util/wmsetbg.c
+++ b/util/wmsetbg.c
@@ -781,8 +781,12 @@ static Pixmap duplicatePixmap(Pixmap pixmap, int width, int height)
Display *tmpDpy;
Pixmap copyP;

- /* must open a new display or the RetainPermanent will
- * leave stuff allocated in RContext unallocated after exit */
+ /* Open a separate connection so the pixmap survives our exit.
+ * RetainTemporary (not RetainPermanent) is used intentionally:
+ * the pixmap lives until the X session ends, avoiding the need
+ * for XKillClient() on old pixmaps (which can crash when the
+ * X server reuses a client ID that now belongs to our own
+ * connection, causing "X connection broken"). */
tmpDpy = XOpenDisplay(display);
if (!tmpDpy) {
wwarning("could not open display to update background image information");
@@ -795,21 +799,13 @@ static Pixmap duplicatePixmap(Pixmap pixmap, int width, int height)
XCopyArea(tmpDpy, pixmap, copyP, DefaultGC(tmpDpy, scr), 0, 0, width, height, 0, 0);
XSync(tmpDpy, False);

- XSetCloseDownMode(tmpDpy, RetainPermanent);
+ XSetCloseDownMode(tmpDpy, RetainTemporary);
XCloseDisplay(tmpDpy);
}

return copyP;
}

-static int dummyErrorHandler(Display * dpy, XErrorEvent * err)
-{
- /* Parameter not used, but tell the compiler that it is ok */
- (void) dpy;
- (void) err;
-
- return 0;
-}

static void setPixmapProperty(Pixmap pixmap)
{
@@ -818,7 +814,6 @@ static void setPixmapProperty(Pixmap pixmap)
int format;
unsigned long length, after;
unsigned char *data;
- int mode;

if (!prop) {
prop = XInternAtom(dpy, "_XROOTPMAP_ID", False);
@@ -826,23 +821,21 @@ static void setPixmapProperty(Pixmap pixmap)

XGrabServer(dpy);

- /* Clear out the old pixmap */
+ /* Read and discard the old property data. We no longer call
+ * XKillClient() on the old pixmap: since duplicatePixmap() uses
+ * RetainTemporary, old pixmaps are freed automatically when the
+ * X session ends. Calling XKillClient() here was unsafe because
+ * the X server reuses client IDs; if the stored resource ID was
+ * reassigned to our own connection the server would kill us,
+ * producing "X connection to :0 broken". */
XGetWindowProperty(dpy, root, prop, 0L, 1L, False, AnyPropertyType,
&type, &format, &length, &after, &data);
if (data)
XFree(data);

- if ((type == XA_PIXMAP) && (format == 32) && (length == 1)) {
- XSetErrorHandler(dummyErrorHandler);
- XKillClient(dpy, *((Pixmap *) data));
- XSync(dpy, False);
- XSetErrorHandler(NULL);
- mode = PropModeReplace;
- } else {
- mode = PropModeAppend;
- }
if (pixmap)
- XChangeProperty(dpy, root, prop, XA_PIXMAP, 32, mode, (unsigned char *)&pixmap, 1);
+ XChangeProperty(dpy, root, prop, XA_PIXMAP, 32, PropModeReplace,
+ (unsigned char *)&pixmap, 1);
else
XDeleteProperty(dpy, root, prop);


commit 7c80e917d7c5e665c779dcbde9f3559e84d57c12
Author: Haroldo Santos <haroldo...@gmail.com>
Date: Mon, 15 Jun 2026 08:19:23 -0400
URL: <https://repo.or.cz/wmaker-crm.git/7c80e917d7c5e665>

wmsetbg: fix memory leak of XGetWindowProperty data in setPixmapProperty

XGetWindowProperty() allocates a buffer and returns it via the 'data'
pointer; the caller is responsible for freeing it with XFree() when
done. setPixmapProperty() read the old _XROOTPMAP_ID value but never
freed the returned buffer, leaking memory on every background change.

Add the missing XFree(data) call.

Co-authored-by: Copilot <22355621...@users.noreply.github.com>
---
util/wmsetbg.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/util/wmsetbg.c b/util/wmsetbg.c
index dc747d0488c2..5e75ca0e9f41 100644
--- a/util/wmsetbg.c
+++ b/util/wmsetbg.c
@@ -829,6 +829,8 @@ static void setPixmapProperty(Pixmap pixmap)
/* Clear out the old pixmap */
XGetWindowProperty(dpy, root, prop, 0L, 1L, False, AnyPropertyType,
&type, &format, &length, &after, &data);
+ if (data)
+ XFree(data);

if ((type == XA_PIXMAP) && (format == 32) && (length == 1)) {
XSetErrorHandler(dummyErrorHandler);

-----------------------------------------------------------------------

Summary of changes:
util/wmsetbg.c | 41 ++++++++++++++++++-----------------------
1 file changed, 18 insertions(+), 23 deletions(-)


repo.or.cz automatic notification. Contact project admin crm...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")