pool/xorg-x11-server
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- u_miCloseScreen_check_for_null_pScreen_dev_private.patch

Browse Source 
* miCloseScreen check for null pScreen dev private (bsc#1218176); 
    another regression introduced by 
    U_bsc1216261-0002-fb-properly-wrap-unwrap-CloseScreen.patch

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=866
This commit is contained in:
Stefan Dirsch 2024-01-06 20:07:07 +00:00 committed by Git OBS Bridge
parent 605942037e
commit 678de8e366
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
u_miCloseScreen_check_for_null_pScreen_dev_private.patch Normal file
View File

@ -0,0 +1,17 @@
mi/miscrinit.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: xorg-server-21.1.4/mi/miscrinit.c
===================================================================
--- xorg-server-21.1.4.orig/mi/miscrinit.c
+++ xorg-server-21.1.4/mi/miscrinit.c
@@ -121,7 +121,9 @@ miModifyPixmapHeader(PixmapPtr pPixmap,
static Bool
miCloseScreen(ScreenPtr pScreen)
{
- return ((*pScreen->DestroyPixmap) ((PixmapPtr) pScreen->devPrivate));
+ if (pScreen->devPrivate)
+ return ((*pScreen->DestroyPixmap) ((PixmapPtr) pScreen->devPrivate));
+ return TRUE;
}
static Bool

8
xorg-x11-server.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Jan 6 20:01:20 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- u_miCloseScreen_check_for_null_pScreen_dev_private.patch
* miCloseScreen check for null pScreen dev private (bsc#1218176);
another regression introduced by
U_bsc1216261-0002-fb-properly-wrap-unwrap-CloseScreen.patch
-------------------------------------------------------------------
Sat Jan 6 15:12:29 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>

4
xorg-x11-server.spec
View File

@ -246,6 +246,8 @@ Patch1960: u_sync-pci-ids-with-Mesa.patch
Patch1217765: U_bsc1217765-Xi-allocate-enough-XkbActions-for-our-buttons.patch
Patch1217766: U_bsc1217766-randr-avoid-integer-truncation-in-length-check-of-Pr.patch
Patch1218176: u_miCloseScreen_check_for_null_pScreen_dev_private.patch
%description
This package contains the X.Org Server.
@ -407,6 +409,8 @@ sh %{SOURCE92} --verify . %{SOURCE91}
%patch1217765 -p1
%patch1217766 -p1
%patch1218176 -p1
%build
# We have some -z now related errors during X default startup (boo#1197994):
# - when loading modesetting: gbm_bo_get_plane_count