summaryrefslogtreecommitdiff
path: root/x11-base/xorg-server/files/xorg-server-21.1.3-present-null-check.patch
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base/xorg-server/files/xorg-server-21.1.3-present-null-check.patch')
-rw-r--r--x11-base/xorg-server/files/xorg-server-21.1.3-present-null-check.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/xorg-server-21.1.3-present-null-check.patch b/x11-base/xorg-server/files/xorg-server-21.1.3-present-null-check.patch
new file mode 100644
index 000000000000..15d653320708
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-21.1.3-present-null-check.patch
@@ -0,0 +1,36 @@
+https://gitlab.freedesktop.org/xorg/xserver/-/commit/22d58188
+https://bugs.gentoo.org/830482
+
+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>
+--- 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