brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backends/x11: Fix type confusion about object data

Browse Source 
Since c390f70edc ("backend: Set up and use ownership chains")
the type of the ClutterInputDevice object's "meta-input-settings-xdevice"
data is `DeviceHandle`, but that commit failed to change the one place
where the object data is queried. As a consequence, that part still
considers it to be an `XDevice`, so everything that uses the return
value of `device_ensure_xdevice()` works with invalid data. Furthermore,
`device_handle_free()` incorrectly uses the `user_data` as the argument
for `XCloseDevice()` leading to a double free.

Fixes: c390f70edc ("backend: Set up and use ownership chains")
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2995>
This commit is contained in:
Barnabás Pőcze 2023-05-09 17:15:52 +02:00 committed by Marge Bot
parent 10d370eb03
commit f01428bd96
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/backends/x11/meta-input-settings-x11.c
View File

@ -75,10 +75,9 @@ device_handle_free (gpointer user_data)
MetaDisplay *display = get_display (settings); MetaDisplay *display = get_display (settings);
MetaBackend *backend = get_backend (settings); MetaBackend *backend = get_backend (settings);
Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend)); Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
XDevice *xdev = user_data;
meta_x11_error_trap_push (display->x11_display); meta_x11_error_trap_push (display->x11_display);
XCloseDevice (xdisplay, xdev); XCloseDevice (xdisplay, handle->xdev);
meta_x11_error_trap_pop (display->x11_display); meta_x11_error_trap_pop (display->x11_display);
g_free (handle); g_free (handle);
@ -92,11 +91,12 @@ device_ensure_xdevice (MetaInputSettings *settings,
MetaBackend *backend = get_backend (settings); MetaBackend *backend = get_backend (settings);
Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend)); Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
int device_id = meta_input_device_x11_get_device_id (device); int device_id = meta_input_device_x11_get_device_id (device);
XDevice *xdev = NULL; DeviceHandle *handle;
XDevice *xdev;
xdev = g_object_get_data (G_OBJECT (device), "meta-input-settings-xdevice"); handle = g_object_get_data (G_OBJECT (device), "meta-input-settings-xdevice");
if (xdev) if (handle)
return xdev; return handle->xdev;
meta_x11_error_trap_push (display->x11_display); meta_x11_error_trap_push (display->x11_display);
xdev = XOpenDevice (xdisplay, device_id); xdev = XOpenDevice (xdisplay, device_id);
@ -104,8 +104,6 @@ device_ensure_xdevice (MetaInputSettings *settings,
if (xdev) if (xdev)
{ {
DeviceHandle *handle;
handle = g_new0 (DeviceHandle, 1); handle = g_new0 (DeviceHandle, 1);
handle->settings = settings; handle->settings = settings;
handle->xdev = xdev; handle->xdev = xdev;