Fix crash disabling monitor with locked surface

(cherry picked from commit d1880b4422)
remove binary before copying to destination
2026-06-22 07:02:45 +00:00 · 2025-06-18 22:10:34 +02:00 · 2025-03-13 22:00:48 +01:00 · 2025-03-13 21:59:55 +01:00 · 2025-03-13 21:58:14 +01:00 · 2024-08-27 23:07:21 -06:00
3 changed files with 22 additions and 4 deletions
@@ -1,10 +1,24 @@
 # Changelog

+* [Unreleased](#unreleased)
 * [0.7](#0.7)
 * [0.6](#0.6)
 * [0.5](#0.5)


+## Unreleased
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+
+* Crash when a client is created while all outputs are disabled.
+
+### Security
+### Contributors
+
+
 ## 0.7

 See also [0.6](#0.6) release notes. 0.7 builds against wlroots 0.18.x.
@@ -61,6 +61,7 @@ dist: clean

 install: dwl
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	rm -f $(DESTDIR)$(PREFIX)/bin/dwl
 	cp -f dwl $(DESTDIR)$(PREFIX)/bin
 	chmod 755 $(DESTDIR)$(PREFIX)/bin/dwl
 	mkdir -p $(DESTDIR)$(MANDIR)/man1
@@ -716,6 +716,8 @@ cleanupmon(struct wl_listener *listener, void *data)
 	wl_list_remove(&m->frame.link);
 	wl_list_remove(&m->link);
 	wl_list_remove(&m->request_state.link);
+	if (m->lock_surface)
+		destroylocksurface(&m->destroy_lock_surface, NULL);
 	m->wlr_output->data = NULL;
 	wlr_output_layout_remove(output_layout, m->wlr_output);
 	wlr_scene_output_destroy(m->scene_output);
@@ -803,8 +805,10 @@ commitnotify(struct wl_listener *listener, void *data)
 		 * a wrong monitor.
 		 */
 		applyrules(c);
-		wlr_surface_set_preferred_buffer_scale(client_surface(c), (int)ceilf(c->mon->wlr_output->scale));
-		wlr_fractional_scale_v1_notify_scale(client_surface(c), c->mon->wlr_output->scale);
+		if (c->mon) {
+			wlr_surface_set_preferred_buffer_scale(client_surface(c), (int)ceilf(c->mon->wlr_output->scale));
+			wlr_fractional_scale_v1_notify_scale(client_surface(c), c->mon->wlr_output->scale);
+		}
 		setmon(c, NULL, 0); /* Make sure to reapply rules in mapnotify() */

 		wlr_xdg_toplevel_set_wm_capabilities(c->surface.xdg->toplevel, WLR_XDG_TOPLEVEL_WM_CAPABILITIES_FULLSCREEN);
@@ -1175,7 +1179,6 @@ void
 destroydecoration(struct wl_listener *listener, void *data)
 {
 	Client *c = wl_container_of(listener, c, destroy_decoration);
-	c->decoration = NULL;

 	wl_list_remove(&c->destroy_decoration.link);
 	wl_list_remove(&c->set_decoration_mode.link);
@@ -3141,7 +3144,7 @@ sethints(struct wl_listener *listener, void *data)
 {
 	Client *c = wl_container_of(listener, c, set_hints);
 	struct wlr_surface *surface = client_surface(c);
-	if (c == focustop(selmon))
+	if (c == focustop(selmon) || !c->surface.xwayland->hints)
 		return;

 	c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints);
Author	SHA1	Message	Date
Nikita Ivanov	d5bbe6d54d	Fix crash disabling monitor with locked surface (cherry picked from commit `d1880b4422`)	2025-06-18 22:10:34 +02:00
Leonardo Hernández Hernández	2783d91611	remove binary before copying to destination Since Linux 6.11 is possible overwrite a running executable, possibly making it crash. Thanks to: movq42rax Fixes: https://codeberg.org/dwl/dwl/issues/709 References: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2a010c412853 References: https://lore.kernel.org/stable/CACKH++YAtEMYu2nTLUyfmxZoGO37fqogKMDkBpddmNaz5HE6ng@mail.gmail.com/T/#u (cherry picked from commit `1d08ade132`)	2025-03-13 22:00:48 +01:00
Guido Cella	b2abff8b57	fix a use after free This line makes dwl crash after closing mpv with the switchtotag patch. (cherry picked from commit `8206cc8889`)	2025-03-13 21:59:55 +01:00
DreamMaoMao	298c6e1839	fix: crash when open some x11 app (cherry picked from commit `e0f531d508`)	2025-03-13 21:58:14 +01:00
Leonardo Hernández Hernández	cfc80c8f44	fix crash when a client is created while all outputs are disabled	2024-08-27 23:07:21 -06:00
Leonardo Hernández Hernández	0e0c97db56	changelog: add new 'unreleased' section	2024-08-27 23:07:13 -06:00