Attachment 870206 Details for Bug 1216261

[patch] 0001-mi-fix-CloseScreen-initialization-order.patch

0001-mi-fix-CloseScreen-initialization-order.patch (text/plain), 1020 bytes, created by Marcus Meissner on 2023-10-16 08:18:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2023-10-16 08:18:18 UTC

Size: 1020 bytes

patch

obsolete

>From 5aab7b4f64444000f6150d6250610ff45ec6b2a1 Mon Sep 17 00:00:00 2001
>From: Peter Hutterer <peter.hutterer@who-t.net>
>Date: Thu, 12 Oct 2023 12:42:06 +1000
>Subject: [PATCH xserver 1/2] mi: fix CloseScreen initialization order
>
>If SHM is enabled it will set the CloseScreen pointer, only to be
>overridden by the hardcoded miCloseScreen pointer. Do this the other way
>round, miCloseScreen is the bottom of our stack.
>---
> mi/miscrinit.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git mi/miscrinit.c mi/miscrinit.c
>index 3bb52b1bc6..b88938c9ae 100644
>--- mi/miscrinit.c
>+++ mi/miscrinit.c
>@@ -249,10 +249,10 @@ miScreenInit(ScreenPtr pScreen, void *pbits,  /* pointer to screen bits */
>     pScreen->numVisuals = numVisuals;
>     pScreen->visuals = visuals;
>     if (width) {
>+        pScreen->CloseScreen = miCloseScreen;
> #ifdef MITSHM
>         ShmRegisterFbFuncs(pScreen);
> #endif
>-        pScreen->CloseScreen = miCloseScreen;
>     }
>     /* else CloseScreen */
>     /* QueryBestSize */
>-- 
>2.41.0
>

Actions: View | Diff

Attachments on bug 1216261: 870206 | 870207 | 870208 | 870426