Blame SOURCES/0001-present-Check-for-NULL-to-prevent-crash.patch

55d6a0
From 94b4a3d45451d29e9539ea234ce8b5e9ed58546c Mon Sep 17 00:00:00 2001
55d6a0
From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl>
55d6a0
Date: Thu, 13 Jan 2022 00:47:27 +0100
55d6a0
Subject: [PATCH xserver] present: Check for NULL to prevent crash
55d6a0
MIME-Version: 1.0
55d6a0
Content-Type: text/plain; charset=UTF-8
55d6a0
Content-Transfer-Encoding: 8bit
55d6a0
55d6a0
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275
55d6a0
Signed-off-by: Błażej Szczygieł <spaz16@wp.pl>
55d6a0
Tested-by: Aaron Plattner <aplattner@nvidia.com>
55d6a0
(cherry picked from commit 22d5818851967408bb7c903cb345b7ca8766094c)
55d6a0
---
55d6a0
 present/present_scmd.c | 6 ++++++
55d6a0
 1 file changed, 6 insertions(+)
55d6a0
55d6a0
diff --git a/present/present_scmd.c b/present/present_scmd.c
55d6a0
index 3c68e690b..11391adbb 100644
55d6a0
--- a/present/present_scmd.c
55d6a0
+++ b/present/present_scmd.c
55d6a0
@@ -168,6 +168,9 @@ present_scmd_get_crtc(present_screen_priv_ptr screen_priv, WindowPtr window)
55d6a0
     if (!screen_priv->info)
55d6a0
         return NULL;
55d6a0
 
55d6a0
+    if (!screen_priv->info->get_crtc)
55d6a0
+        return NULL;
55d6a0
+
55d6a0
     return (*screen_priv->info->get_crtc)(window);
55d6a0
 }
55d6a0
 
55d6a0
@@ -206,6 +209,9 @@ present_flush(WindowPtr window)
55d6a0
     if (!screen_priv->info)
55d6a0
         return;
55d6a0
 
55d6a0
+    if (!screen_priv->info->flush)
55d6a0
+        return;
55d6a0
+
55d6a0
     (*screen_priv->info->flush) (window);
55d6a0
 }
55d6a0
 
55d6a0
-- 
55d6a0
2.34.1
55d6a0