Differential D35661 Diff 107606 x11-servers/xorg-server/files/0004-present_Check_for_NULL_to_prevent_crash.patch
Changeset View
Changeset View
Standalone View
Standalone View
x11-servers/xorg-server/files/0004-present_Check_for_NULL_to_prevent_crash.patch
- This file was added.
| From 69774044716039fa70655b3bc6dd6a4ff4535cfd Mon Sep 17 00:00:00 2001 | |||||
| From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl> | |||||
| Date: Thu, 13 Jan 2022 00:47:27 +0100 | |||||
| Subject: [PATCH] present: Check for NULL to prevent crash | |||||
| MIME-Version: 1.0 | |||||
| Content-Type: text/plain; charset=UTF-8 | |||||
| Content-Transfer-Encoding: 8bit | |||||
| Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275 | |||||
| Signed-off-by: Błażej Szczygieł <spaz16@wp.pl> | |||||
| Tested-by: Aaron Plattner <aplattner@nvidia.com> | |||||
| (cherry picked from commit 22d5818851967408bb7c903cb345b7ca8766094c) | |||||
| --- | |||||
| present/present_scmd.c | 6 ++++++ | |||||
| 1 file changed, 6 insertions(+) | |||||
| diff --git a/present/present_scmd.c b/present/present_scmd.c | |||||
| index da836ea6b..239055bc1 100644 | |||||
| --- a/present/present_scmd.c | |||||
| +++ b/present/present_scmd.c | |||||
| @@ -158,6 +158,9 @@ present_scmd_get_crtc(present_screen_priv_ptr screen_priv, WindowPtr window) | |||||
| if (!screen_priv->info) | |||||
| return NULL; | |||||
| + if (!screen_priv->info->get_crtc) | |||||
| + return NULL; | |||||
| + | |||||
| return (*screen_priv->info->get_crtc)(window); | |||||
| } | |||||
| @@ -196,6 +199,9 @@ present_flush(WindowPtr window) | |||||
| if (!screen_priv->info) | |||||
| return; | |||||
| + if (!screen_priv->info->flush) | |||||
| + return; | |||||
| + | |||||
| (*screen_priv->info->flush) (window); | |||||
| } | |||||
| -- | |||||
| GitLab | |||||