~ruther/dwl

433c325fb2a1d90b36206925fc429e354e248c99 — Guido Cella 2 months ago 6013835
fix a use-after-free

Prevent a use-after-free when closing a nested dwl with Ctrl+c.

It happened because cleanup() → input_method_relay_finish() frees
input_method_relay, and then closemon() → focusclient() →
input_method_relay_set_focus() uses relay->surface.
2 files changed, 2 insertions(+), 1 deletions(-)

M dwl.c
M ime.h
M dwl.c => dwl.c +1 -0
@@ 792,6 792,7 @@ cleanup(void)
	destroykeyboardgroup(&kb_group->destroy, NULL);

	input_method_relay_finish(input_method_relay);
	input_method_relay = NULL;

	/* If it's not destroyed manually, it will cause a use-after-free of wlr_seat.
	 * Destroy it until it's fixed on the wlroots side */

M ime.h => ime.h +1 -1
@@ 625,7 625,7 @@ void
input_method_relay_set_focus(struct input_method_relay *relay,
		struct wlr_surface *surface)
{
	if (relay->focused_surface == surface)
	if (!relay || relay->focused_surface == surface)
		return;

	if (relay->focused_surface)