Both dri2_create_context_attribs and drisw_create_context_attribs call
dri2_convert_glx_attribs, expecting it to fill in *api on success.

However, when num_attribs == 0, it was returning true without setting
*api, causing the caller to use an uninitialized value.

Cc: Vadim Girlin <vadimgir...@gmail.com>
Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
---
 src/glx/dri_common.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Vadim, hopefully this should also fix Unigine Heaven for you.

diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index 8feb587..ed0b134 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -429,8 +429,10 @@ dri2_convert_glx_attribs(unsigned num_attribs, const 
uint32_t *attribs,
    uint32_t profile;
    int render_type = GLX_RGBA_TYPE;
 
-   if (num_attribs == 0)
+   if (num_attribs == 0) {
+      *api = __DRI_API_OPENGL;
       return true;
+   }
 
    /* This is actually an internal error, but what the heck.
     */
-- 
1.7.7.5

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to