34 lines
988 B
Diff
34 lines
988 B
Diff
|
From 3a95c993a8d310122d0a3e91a0fe01c318bd7ecf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dave Airlie <airlied@redhat.com>
|
||
|
|
Date: Fri, 24 Aug 2012 12:56:18 +1000
|
||
|
|
Subject: [PATCH 1/2] xf86/crtc: don't free config->name
|
||
|
|
|
||
|
|
This is set by pre_init not screen init, so if we free it here
|
||
|
|
and then recycle the server, we lose all the providers.
|
||
|
|
|
||
|
|
I think we need to wrap FreeScreen here to do this properly,
|
||
|
|
will investigate for 1.14 most likely, safer to just leak this
|
||
|
|
on server exit for now.
|
||
|
|
|
||
|
|
Signed-off-by: Dave Airlie <airlied@redhat.com>
|
||
|
|
---
|
||
|
|
hw/xfree86/modes/xf86Crtc.c | 2 --
|
||
|
|
1 file changed, 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
|
||
|
|
index 153c795..a1d7dca 100644
|
||
|
|
--- a/hw/xfree86/modes/xf86Crtc.c
|
||
|
|
+++ b/hw/xfree86/modes/xf86Crtc.c
|
||
|
|
@@ -728,8 +728,6 @@ xf86CrtcCloseScreen(ScreenPtr screen)
|
||
|
|
|
||
|
|
xf86RandR12CloseScreen(screen);
|
||
|
|
|
||
|
|
- free(config->name);
|
||
|
|
-
|
||
|
|
screen->CloseScreen(screen);
|
||
|
|
|
||
|
|
for (o = 0; o < config->num_output; o++) {
|
||
|
|
--
|
||
|
|
1.7.11.2
|
||
|
|
|