From 813b2c1edc90d51c2b98385c74dffec56e18da84 Mon Sep 17 00:00:00 2001
From: Polesznyák Márk <contact@pml68.dev>
Date: Sun, 22 Feb 2026 14:35:09 +0100
Subject: chore(dwm): sync with upstream

Commits:
- cleanup schemes and colors (93f2686)
- drw.c: drw_scm_free: call free inside (7c3abae)
- dwm: Fix heap buffer overflow in getatomprop (244fa85)
- dwm: Fix getatomprop regression from heap overflow fix (a9aa0d8)
- fix not updating _NET_ACTIVE_WINDOW (397d618)
- getstate: fix access type and remove redundant cast (5c9f303)
- more overflow fix in getatomprop() (c3dd6a8)
---
 dwm/dwm.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'dwm/dwm.c')

diff --git a/dwm/dwm.c b/dwm/dwm.c
index a10de14..60274dc 100644
--- a/dwm/dwm.c
+++ b/dwm/dwm.c
@@ -556,7 +556,7 @@ cleanup(void)
 	for (i = 0; i < CurLast; i++)
 		drw_cur_free(drw, cursor[i]);
 	for (i = 0; i < LENGTH(colors); i++)
-		free(scheme[i]);
+		drw_scm_free(drw, scheme[i], 3);
 	free(scheme);
 	XDestroyWindow(dpy, wmcheckwin);
 	drw_free(drw);
@@ -949,14 +949,15 @@ focusstack(const Arg *arg)
 Atom
 getatomprop(Client *c, Atom prop)
 {
-	int di;
-	unsigned long dl;
+	int format;
+	unsigned long nitems, dl;
 	unsigned char *p = NULL;
 	Atom da, atom = None;
 
 	if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
-		&da, &di, &dl, &dl, &p) == Success && p) {
-		atom = *(Atom *)p;
+		&da, &format, &nitems, &dl, &p) == Success && p) {
+		if (nitems > 0 && format == 32)
+			atom = *(long *)p;
 		XFree(p);
 	}
 	return atom;
@@ -982,10 +983,10 @@ getstate(Window w)
 	Atom real;
 
 	if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
-		&real, &format, &n, &extra, (unsigned char **)&p) != Success)
+		&real, &format, &n, &extra, &p) != Success)
 		return -1;
-	if (n != 0)
-		result = *p;
+	if (n != 0 && format == 32)
+		result = *(long *)p;
 	XFree(p);
 	return result;
 }
@@ -1581,12 +1582,10 @@ sendevent(Client *c, Atom proto)
 void
 setfocus(Client *c)
 {
-	if (!c->neverfocus) {
+	if (!c->neverfocus)
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-		XChangeProperty(dpy, root, netatom[NetActiveWindow],
-			XA_WINDOW, 32, PropModeReplace,
-			(unsigned char *) &(c->win), 1);
-	}
+	XChangeProperty(dpy, root, netatom[NetActiveWindow], XA_WINDOW, 32,
+		PropModeReplace, (unsigned char *) &(c->win), 1);
 	sendevent(c, wmatom[WMTakeFocus]);
 }
 
-- 
cgit v1.2.3