frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Brian Paul 2007-08-23 19:38:53 +02:00 committed by Julien Cristau
parent 943dd6ad99
commit ff089e6cae
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
GL/glx/glxglcore.c
View File

@ -296,7 +296,7 @@ static void init_screen_visuals(__GLXMESAscreen *screen)
__GLcontextModes *modes; __GLcontextModes *modes;
XMesaVisual *pXMesaVisual; XMesaVisual *pXMesaVisual;
int *used; int *used;
int i, j, size; int num_vis, j, size;
/* Alloc space for the list of XMesa visuals */ /* Alloc space for the list of XMesa visuals */
size = screen->base.numVisuals * sizeof(XMesaVisual); size = screen->base.numVisuals * sizeof(XMesaVisual);
@ -312,7 +312,7 @@ static void init_screen_visuals(__GLXMESAscreen *screen)
used = (int *) xalloc(pScreen->numVisuals * sizeof(int)); used = (int *) xalloc(pScreen->numVisuals * sizeof(int));
memset(used, 0, 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 ) { for ( modes = screen->base.modes; modes != NULL; modes = modes->next ) {
const int vis_class = _gl_convert_to_x_visual_type( modes->visualType ); const int vis_class = _gl_convert_to_x_visual_type( modes->visualType );
const int nplanes = (modes->rgbBits - modes->alphaBits); const int nplanes = (modes->rgbBits - modes->alphaBits);
@ -327,7 +327,8 @@ static void init_screen_visuals(__GLXMESAscreen *screen)
!used[j]) { !used[j]) {
/* Create the XMesa visual */ /* Create the XMesa visual */
pXMesaVisual[i] = assert(num_vis < screen->base.numVisuals);
pXMesaVisual[num_vis] =
XMesaCreateVisual(pScreen, XMesaCreateVisual(pScreen,
&pVis[j], &pVis[j],
modes->rgbMode, modes->rgbMode,
@ -364,13 +365,15 @@ static void init_screen_visuals(__GLXMESAscreen *screen)
FatalError( "Matching visual found, but visualID still -1!\n" ); FatalError( "Matching visual found, but visualID still -1!\n" );
} }
i++; num_vis++;
} }
xfree(used); xfree(used);
screen->num_vis = pScreen->numVisuals; screen->num_vis = num_vis;
screen->xm_vis = pXMesaVisual; screen->xm_vis = pXMesaVisual;
assert(screen->num_vis <= screen->base.numVisuals);
} }
static __GLXscreen * static __GLXscreen *