[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes Pull an ups...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/204d011e674d
branches:  trunk
changeset: 7121:204d011e674d
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jul 30 16:34:00 2022 +0000

description:
Pull an upstream (post-21.1) fix for xf86CompatOutput().

https://gitlab.freedesktop.org/xorg/xserver/-/commit/75d70612888f18339703315549db781a22c0cb23
This is an additional fix against the previous revision that is
avaiable in 21.1 branch:
https://gitlab.freedesktop.org/xorg/xserver/-/commit/80eeff3ebac772e25c9107199989e677457dbe06
and may avoid a possible out of bounds access at least on dumb wsfb servers.

ok'ed by mrg@ on current-users@:
https://mail-index.netbsd.org/current-users/2022/07/24/msg042731.html

diffstat:

 external/mit/xorg-server/dist/hw/xfree86/modes/xf86Crtc.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 59f896060ab6 -r 204d011e674d external/mit/xorg-server/dist/hw/xfree86/modes/xf86Crtc.h
--- a/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Crtc.h Sat Jul 30 16:13:53 2022 +0000
+++ b/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Crtc.h Sat Jul 30 16:34:00 2022 +0000
@@ -837,11 +837,11 @@
 static _X_INLINE xf86OutputPtr
 xf86CompatOutput(ScrnInfoPtr pScrn)
 {
-    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+    xf86CrtcConfigPtr config;
 
     if (xf86CrtcConfigPrivateIndex == -1)
         return NULL;
-
+    config = XF86_CRTC_CONFIG_PTR(pScrn);
     if (config->compat_output < 0)
         return NULL;
     return config->output[config->compat_output];