Attachment 887514 Details for Bug 1089244 – first patch - adjusted to eliminate out-of-bounds access and add early return

[patch] first patch - adjusted to eliminate out-of-bounds access and add early return

0021-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch (text/plain), 1.21 KB, created by Daniel Stone on 2014-04-18 10:46:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Stone

Created: 2014-04-18 10:46:03 UTC

Size: 1.21 KB

patch

obsolete

>From d40219f38a33845d8a9850de47ff5d458a3d8209 Mon Sep 17 00:00:00 2001
>From: Ray Strode <rstrode@redhat.com>
>Date: Fri, 13 Sep 2013 17:17:16 -0400
>Subject: [PATCH 21/38] xf86Init: trim out non-wayland capable servers from
> drive list
>
>Otherwise they'll cause the server to crash when run in wayland mode.
>---
> hw/xfree86/common/xf86Init.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
>diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
>index 2d3bb01..6282252 100644
>--- a/hw/xfree86/common/xf86Init.c
>+++ b/hw/xfree86/common/xf86Init.c
>@@ -558,6 +558,20 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
> 	    }
>         }
> 
>+        for (i = 0; i < xf86NumDrivers; i++) {
>+                if (xf86DriverList[i] == NULL) {
>+                        for (j = i; j < xf86NumDrivers - 1; j++) {
>+                            xf86DriverList[j] = xf86DriverList[j + 1];
>+                        }
>+                        xf86NumDrivers--;
>+                }
>+        }
>+
>+        if (xf86NumDrivers == 0) {
>+            xf86Msg(X_ERROR, "All drivers eliminated by constraints.\n");
>+            return;
>+        }
>+
>         if (xorgHWOpenConsole)
>             xf86OpenConsole();
>         else
>-- 
>1.8.4.2
>

Actions: View | Diff

Attachments on bug 1089244: 887514 | 887515