diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2007-08-23 19:38:53 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-08-23 12:23:01 -0700 |
| commit | 37954c019afd92edbe4aaa9d6deb6efaad7bf088 (patch) | |
| tree | 877bda79659ecfb2ee2853a896cfba0115347cfc | |
| parent | d34b66402c9205aae38316c5855f3b492a7612c2 (diff) | |
glx: fix crash when freeing visuals
Don't set screen->num_vis to a value greater than the actual number of visuals.
X.Org Bug #10809 <http://bugs.freedesktop.org/show_bug.cgi?id=10809>
(cherry picked from commit ff089e6cae634ac3eb509abd448a250bcbb17275)
| -rw-r--r-- | GL/glx/glxglcore.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/GL/glx/glxglcore.c b/GL/glx/glxglcore.c index df9be07c0..679d55c5d 100644 --- a/GL/glx/glxglcore.c +++ b/GL/glx/glxglcore.c @@ -296,7 +296,7 @@ static void init_screen_visuals(__GLXMESAscreen *screen) __GLcontextModes *modes; XMesaVisual *pXMesaVisual; int *used; - int i, j, size; + int num_vis, j, size; /* Alloc space for the list of XMesa visuals */ size = screen->base.numVisuals * sizeof(XMesaVisual); @@ -312,7 +312,7 @@ static void init_screen_visuals(__GLXMESAscreen *screen) used = (int *) xalloc(pScreen->numVisuals * sizeof(int)); memset(used, 0, pScreen->numVisuals * sizeof(int)); - i = 0; + num_vis = 0; for ( modes = screen->base.modes; modes != NULL; modes = modes->next ) { const int vis_class = _gl_convert_to_x_visual_type( modes->visualType ); const int nplanes = (modes->rgbBits - modes->alphaBits); @@ -327,7 +327,8 @@ static void init_screen_visuals(__GLXMESAscreen *screen) !used[j]) { /* Create the XMesa visual */ - pXMesaVisual[i] = + assert(num_vis < screen->base.numVisuals); + pXMesaVisual[num_vis] = XMesaCreateVisual(pScreen, &pVis[j], modes->rgbMode, @@ -364,13 +365,15 @@ static void init_screen_visuals(__GLXMESAscreen *screen) FatalError( "Matching visual found, but visualID still -1!\n" ); } - i++; + num_vis++; } xfree(used); - screen->num_vis = pScreen->numVisuals; + screen->num_vis = num_vis; screen->xm_vis = pXMesaVisual; + + assert(screen->num_vis <= screen->base.numVisuals); } static __GLXscreen * |