summaryrefslogtreecommitdiffstats
path: root/src/glx/x11
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-06-30 08:56:53 -0600
committerBrian Paul <[email protected]>2009-06-30 08:56:53 -0600
commitb40dc7e7fcafc30ebaa3778ee847c8983987de83 (patch)
treeb8ed89d7d8ba3fc2c25b3e2f95a62b1820557aac /src/glx/x11
parentb750b9fc3d12e4c23ef74181a6252e0e054a3985 (diff)
parent4c31632817a0bde28ad6c9ee8032d838ce4b7bfb (diff)
Merge branch 'mesa_7_5_branch'
Conflicts: src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to 'src/glx/x11')
-rw-r--r--src/glx/x11/drisw_glx.c2
-rw-r--r--src/glx/x11/glxcmds.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/glx/x11/drisw_glx.c b/src/glx/x11/drisw_glx.c
index b843ce484fb..1c229dde900 100644
--- a/src/glx/x11/drisw_glx.c
+++ b/src/glx/x11/drisw_glx.c
@@ -401,6 +401,8 @@ driCreateScreen(__GLXscreenConfigs * psc, int screen,
psc->configs = driConvertConfigs(psc->core, psc->configs, driver_configs);
psc->visuals = driConvertConfigs(psc->core, psc->visuals, driver_configs);
+ free(driver_configs);
+
psp->destroyScreen = driDestroyScreen;
psp->createContext = driCreateContext;
psp->createDrawable = driCreateDrawable;
diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index 77471b8599c..820d8b98685 100644
--- a/src/glx/x11/glxcmds.c
+++ b/src/glx/x11/glxcmds.c
@@ -164,7 +164,7 @@ GetGLXScreenConfigs(Display *dpy, int scrn)
{
__GLXdisplayPrivate * const priv = __glXInitialize(dpy);
- return (priv->screenConfigs != NULL) ? &priv->screenConfigs[scrn] : NULL;
+ return (priv && priv->screenConfigs != NULL) ? &priv->screenConfigs[scrn] : NULL;
}