[arch-commits] Commit in xorg-server/trunk (2 files)

[Andreas Radke]

    Date: Saturday, February 19, 2022 @ 21:26:33
  Author: andyrtr
Revision: 437779

upgpkg: xorg-server 21.1.3-6: try to fix another crash with closed nvidia FS#73895

Added:
  xorg-server/trunk/0004-present_Check_for_NULL_to_prevent_crash.patch
Modified:
  xorg-server/trunk/PKGBUILD

----------------------------------------------------+
 0004-present_Check_for_NULL_to_prevent_crash.patch |   43 +++++++++++++++++++
 PKGBUILD                                           |    8 ++-
 2 files changed, 49 insertions(+), 2 deletions(-)

Added: 0004-present_Check_for_NULL_to_prevent_crash.patch
===================================================================
--- 0004-present_Check_for_NULL_to_prevent_crash.patch	                        (rev 0)
+++ 0004-present_Check_for_NULL_to_prevent_crash.patch	2022-02-19 21:26:33 UTC (rev 437779)
@@ -0,0 +1,43 @@
+From 69774044716039fa70655b3bc6dd6a4ff4535cfd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16 at 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 at wp.pl>
+Tested-by: Aaron Plattner <aplattner at 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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-19 21:02:14 UTC (rev 437778)
+++ PKGBUILD	2022-02-19 21:26:33 UTC (rev 437779)
@@ -5,7 +5,7 @@
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 'xorg-server-xnest'
          'xorg-server-common' 'xorg-server-devel')
 pkgver=21.1.3
-pkgrel=5
+pkgrel=6
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -24,6 +24,7 @@
         0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
         0002-xephyr_Dont_check_for_SeatId_anymore.patch
         0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch
+        0004-present_Check_for_NULL_to_prevent_crash.patch
 )
 validpgpkeys=('FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas at radix.lt>
 sha512sums=('cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b'
@@ -32,7 +33,8 @@
             'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
             'bc3b955072f320ae72a771bebecbcf56637cd0448c3afa28149fcd9e0de3700e9fba1fec21fe283be77e1236e317e385f6970eb59df54d3181324c229c8309d7'
             '34de52147054535256f35143d321e4d5e189baae502afca2bd3291094946dbead0829b1f196ae2a4d23bd6d0e1e04b65a387dee43f12dee55d247e37aec419d7'
-            '01acc49ee9d0681b1ec3f9f22cd4e0dbaee2f5395ebe796e158e30c7d61890337a01fe7ace267d90d62e29f3d74b981391feb7cc5840c187d62f9433ce8e1fff')
+            '01acc49ee9d0681b1ec3f9f22cd4e0dbaee2f5395ebe796e158e30c7d61890337a01fe7ace267d90d62e29f3d74b981391feb7cc5840c187d62f9433ce8e1fff'
+            'a61128b27b76b7089a4b43f9b679d9ecd607b5d8645fa5ef635902e4a51a7609e3bff0190d877117ce324d49a2711375850df2046f4cad99ea8a8c6cc8cf11fa')
 
 prepare() {
   cd ${pkgbase}-$pkgver
@@ -43,6 +45,8 @@
   patch -Np1 -i ../0002-xephyr_Dont_check_for_SeatId_anymore.patch
   # FS#73875
   patch -Np1 -i ../0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch
+  # FS#73895
+  patch -Np1 -i ../0004-present_Check_for_NULL_to_prevent_crash.patch
 }
 
 build() {