summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2012-01-15 02:26:43 -0800
committerJeremy Huddleston <jeremyhu@apple.com>2012-01-15 02:28:07 -0800
commit78d39b3222a4b0b92d840137f5455d3a20dd6906 (patch)
treeddc1a134a8cb060ecef96af85473d2f9988e2b8c
parentf9e6858d5c10be6a8439c0f18bfb2325fa0ee070 (diff)
Revert "glx: don't leak fbconfigs"
This reverts commit d26fae246d7c451b4d5ffe24fdb959d4bd00b107. This patch free()s memory in __glXScreenDestroy which was allocated in glxdricommon (which isn't in every DDX). That breaks abstraction and causes a crash when XQuartz quits, because it results in freeing a pointer that was never allocated. The correct fix is to do this cleanup in __glXDRIscreenDestroy. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--glx/glxscreens.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index 928cf0c92..ebb9747b4 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -419,15 +419,6 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
void __glXScreenDestroy(__GLXscreen *screen)
{
- __GLXconfig *head, *next;
-
- head = screen->fbconfigs;
- while (head) {
- next = head->next;
- free(head);
- head = next;
- }
-
free(screen->GLXvendor);
free(screen->GLXextensions);
free(screen->GLextensions);