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

kms/impl-device/atomic: Don't leak drm commit request on error

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2853>
This commit is contained in:
Jonas Ådahl 2022-06-10 22:51:56 +02:00 committed by Marge Bot
parent 06ef07f322
commit 0b325d64f4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backends/native/meta-kms-impl-device-atomic.c
View File

@ -1019,7 +1019,6 @@ meta_kms_impl_device_atomic_process_update (MetaKmsImplDevice *impl_device,
fd = meta_kms_impl_device_get_fd (impl_device); fd = meta_kms_impl_device_get_fd (impl_device);
ret = drmModeAtomicCommit (fd, req, commit_flags, impl_device); ret = drmModeAtomicCommit (fd, req, commit_flags, impl_device);
drmModeAtomicFree (req);
if (ret < 0) if (ret < 0)
{ {
g_set_error (&error, G_IO_ERROR, g_io_error_from_errno (-ret), g_set_error (&error, G_IO_ERROR, g_io_error_from_errno (-ret),
@ -1027,6 +1026,8 @@ meta_kms_impl_device_atomic_process_update (MetaKmsImplDevice *impl_device,
goto err; goto err;
} }
drmModeAtomicFree (req);
process_entries (impl_device, process_entries (impl_device,
update, update,
req, req,
@ -1055,6 +1056,9 @@ err:
NULL); NULL);
} }
if (req)
drmModeAtomicFree (req);
release_blob_ids (impl_device, blob_ids); release_blob_ids (impl_device, blob_ids);
return meta_kms_feedback_new_failed (failed_planes, error); return meta_kms_feedback_new_failed (failed_planes, error);