mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-04-08 08:21:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #724 from hboetes/fix-last-cursor-use-after-free

Browse source 
Fix use-after-free crash in cursor surface handling
This commit is contained in:
DreamMaoMao 2026-03-02 09:04:43 +08:00 • committed by GitHub
commit 0673a9241d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/mango.c
View file

@ -914,6 +914,15 @@ static struct {
int32_t hotspot_y; int32_t hotspot_y;
} last_cursor; } last_cursor;
static void last_cursor_surface_destroy(struct wl_listener *listener, void *data) {
last_cursor.surface = NULL;
wl_list_remove(&listener->link);
wl_list_init(&listener->link);
}
static struct wl_listener last_cursor_surface_destroy_listener = {
.notify = last_cursor_surface_destroy
};
#include "client/client.h" #include "client/client.h"
#include "config/preset.h" #include "config/preset.h"
@ -2158,6 +2167,11 @@ void setcursorshape(struct wl_listener *listener, void *data) {
* actually has pointer focus first. If so, we can tell the cursor to * actually has pointer focus first. If so, we can tell the cursor to
* use the provided cursor shape. */ * use the provided cursor shape. */
if (event->seat_client == seat->pointer_state.focused_client) { if (event->seat_client == seat->pointer_state.focused_client) {
/* Remove surface destroy listener if active */
if (!wl_list_empty(&last_cursor_surface_destroy_listener.link))
wl_list_remove(&last_cursor_surface_destroy_listener.link);
wl_list_init(&last_cursor_surface_destroy_listener.link);
last_cursor.shape = event->shape; last_cursor.shape = event->shape;
last_cursor.surface = NULL; last_cursor.surface = NULL;
if (!cursor_hidden) if (!cursor_hidden)
@ -4934,10 +4948,21 @@ void setcursor(struct wl_listener *listener, void *data) {
* hardware cursor on the output that it's currently on and continue to * hardware cursor on the output that it's currently on and continue to
* do so as the cursor moves between outputs. */ * do so as the cursor moves between outputs. */
if (event->seat_client == seat->pointer_state.focused_client) { if (event->seat_client == seat->pointer_state.focused_client) {
/* Clear previous surface destroy listener if any */
if (!wl_list_empty(&last_cursor_surface_destroy_listener.link))
wl_list_remove(&last_cursor_surface_destroy_listener.link);
wl_list_init(&last_cursor_surface_destroy_listener.link);
last_cursor.shape = 0; last_cursor.shape = 0;
last_cursor.surface = event->surface; last_cursor.surface = event->surface;
last_cursor.hotspot_x = event->hotspot_x; last_cursor.hotspot_x = event->hotspot_x;
last_cursor.hotspot_y = event->hotspot_y; last_cursor.hotspot_y = event->hotspot_y;
/* Track surface destruction to avoid dangling pointer */
if (event->surface)
wl_signal_add(&event->surface->events.destroy,
&last_cursor_surface_destroy_listener);
if (!cursor_hidden) if (!cursor_hidden)
wlr_cursor_set_surface(cursor, event->surface, event->hotspot_x, wlr_cursor_set_surface(cursor, event->surface, event->hotspot_x,
event->hotspot_y); event->hotspot_y);
@ -5400,6 +5425,8 @@ void handle_print_status(struct wl_listener *listener, void *data) {
void setup(void) { void setup(void) {
wl_list_init(&last_cursor_surface_destroy_listener.link);
setenv("XCURSOR_SIZE", "24", 1); setenv("XCURSOR_SIZE", "24", 1);
setenv("XDG_CURRENT_DESKTOP", "mango", 1); setenv("XDG_CURRENT_DESKTOP", "mango", 1);
@ -5834,7 +5861,7 @@ void handlecursoractivity(void) {
if (last_cursor.shape) if (last_cursor.shape)
wlr_cursor_set_xcursor(cursor, cursor_mgr, wlr_cursor_set_xcursor(cursor, cursor_mgr,
wlr_cursor_shape_v1_name(last_cursor.shape)); wlr_cursor_shape_v1_name(last_cursor.shape));
else else if (last_cursor.surface)
wlr_cursor_set_surface(cursor, last_cursor.surface, wlr_cursor_set_surface(cursor, last_cursor.surface,
last_cursor.hotspot_x, last_cursor.hotspot_y); last_cursor.hotspot_x, last_cursor.hotspot_y);
} }