xserver: Branch 'master'

[Keith Packard]

 glx/glxdri.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit cc3d1a5a6120e721a46c67446ba68f5596055633
Author: Piotr Dziwinski <piotrdz at gmail.com>
Date:   Sat Feb 23 13:14:45 2013 +0100

    glx: fix uninitialized var in __glXDRIscreenProbe
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=59825
    
    Signed-off-by: Piotr Dziwinski <piotrdz at gmail.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glx/glxdri.c b/glx/glxdri.c
index da46468..a997e2f 100644
--- a/glx/glxdri.c
+++ b/glx/glxdri.c
@@ -971,6 +971,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     size_t buffer_size;
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 
+    framebuffer.base = NULL;
+
     if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
         !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) {
         LogMessage(X_INFO,