From: José Fonseca <jfonseca@vmware.com>
Date: Thu, 12 May 2011 14:23:48 +0000 (+0100)
Subject: egl/dri2: Prevent uninitialized variable dereference.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4a47d6d46b397bf31a1fd22d35bd40ef03bd9357;p=mesa.git

egl/dri2: Prevent uninitialized variable dereference.
---

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 1acec51a433..0e1a1b52a4c 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -205,8 +205,7 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id,
           */
          num_configs = 0;
    }
-
-   if (num_configs == 0) {
+   else if (num_configs == 0) {
       conf = malloc(sizeof *conf);
       if (conf == NULL)
          return NULL;
@@ -224,6 +223,10 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id,
 
       _eglLinkConfig(&conf->base);
    }
+   else {
+      assert(0);
+      return NULL;
+   }
 
    conf->base.SurfaceType |= surface_type & (!double_buffer ? EGL_PIXMAP_BIT:
          (EGL_WINDOW_BIT | EGL_PBUFFER_BIT | EGL_SWAP_BEHAVIOR_PRESERVED_BIT));