diff options
| author | Daniel van Vugt <daniel.van.vugt@canonical.com> | 2021-11-02 18:48:45 +0800 |
|---|---|---|
| committer | Robert Mader <robert.mader@collabora.com> | 2022-02-14 12:23:50 +0100 |
| commit | 0e0aa778880ddffc6d1d4eba131bb37048f469cf (patch) | |
| tree | 4716131a55390cf78ed3b7d4bdceafd0b8cbd727 | |
| parent | bfb7151cc3e7303c93a2cd62a963ad8507565f4e (diff) | |
| download | mutter-0e0aa778880ddffc6d1d4eba131bb37048f469cf.tar.gz | |
onscreen/native: Warn instead of crashing if the frame_info queue is empty
Some Ubuntu systems with mutter 40 and 41 report `maybe_update_frame_info`
crashes with SIGSEGV when `frame_info == NULL`.
The same was reported by @rmader as happening "after wakeup" in testing
(https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1441#note_1301588)
although the Ubuntu reports show it's not related to that MR.
Fixes: https://launchpad.net/bugs/1960585
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2282>
(cherry picked from commit b7f7b82b891a702aa55b33ba8a33054829b92509)
| -rw-r--r-- | src/backends/native/meta-onscreen-native.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c index 05c3b6b9f..f56c6b13e 100644 --- a/src/backends/native/meta-onscreen-native.c +++ b/src/backends/native/meta-onscreen-native.c @@ -226,6 +226,8 @@ notify_view_crtc_presented (MetaRendererView *view, frame_info = cogl_onscreen_peek_head_frame_info (onscreen); + g_return_if_fail (frame_info != NULL); + crtc = META_CRTC (meta_crtc_kms_from_kms_crtc (kms_crtc)); maybe_update_frame_info (crtc, frame_info, time_us, flags, sequence); |