From: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date: Tue, 8 May 2018 21:36:33 +0000 (+0100)
Subject: renderer-native: Don't crash if the FB surface can't be locked
X-Git-Tag: archive/raspbian/3.28.2-3+rpi1^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=76b827c386cce28051c6445369606211d902911b;p=mutter.git

renderer-native: Don't crash if the FB surface can't be locked

(cherry picked from commit 0332b7394e56f71c15692663ab05f8c84a4b9eff)

Origin: upstream, 3.28.3, commit:a41d84db00b3105dc630d91707c0f5dd888394ec

Gbp-Pq: Name renderer-native-Don-t-crash-if-the-FB-surface-can-t-be-lo.patch
---

diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
index 2571cac..cb8e03a 100644
--- a/src/backends/native/meta-renderer-native.c
+++ b/src/backends/native/meta-renderer-native.c
@@ -1601,6 +1601,12 @@ gbm_get_next_fb_id (MetaGpuKms         *gpu_kms,
   /* Now we need to set the CRTC to whatever is the front buffer */
   next_bo = gbm_surface_lock_front_buffer (gbm_surface);
 
+  if (!next_bo)
+    {
+      g_error ("Impossible to lock surface front buffer: %m");
+      return FALSE;
+    }
+
   for (i = 0; i < gbm_bo_get_plane_count (next_bo); i++)
     {
       strides[i] = gbm_bo_get_stride_for_plane (next_bo, i);