fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xlib: fix leaks of returned values from XGetVisualInfo

Browse source 
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
This commit is contained in:
John Sheu 2016-04-01 16:52:21 -07:00 • committed by Alejandro Piñeiro
parent 781232e0ac
commit 8a9c0f1025
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/mesa/drivers/x11/fakeglx.c
View file

@ -730,27 +730,39 @@ choose_x_overlay_visual( Display *dpy, int scr,
vislist = XGetVisualInfo( dpy, VisualIDMask | VisualScreenMask,
&vistemplate, &count );
if (!vislist) {
/* no matches */
continue;
}
if (count!=1) {
/* something went wrong */
free(vislist);
continue;
}
if (preferred_class!=DONT_CARE && preferred_class!=vislist->CLASS) {
/* wrong visual class */
free(vislist);
continue;
}
/* Color-index rendering is not supported. Make sure we have True/DirectColor */
if (vislist->CLASS != TrueColor && vislist->CLASS != DirectColor)
if (vislist->CLASS != TrueColor && vislist->CLASS != DirectColor) {
free(vislist);
continue;
if (deepvis==NULL || vislist->depth > deepest) {
/* YES! found a satisfactory visual */
free(deepvis);
deepest = vislist->depth;
deepvis = vislist;
/* DEBUG tt = ov->transparent_type;*/
/* DEBUG tv = ov->value; */
}
if (deepvis!=NULL && vislist->depth <= deepest) {
free(vislist);
continue;
}
/* YES! found a satisfactory visual */
free(deepvis);
deepest = vislist->depth;
deepvis = vislist;
/* DEBUG tt = ov->transparent_type;*/
/* DEBUG tv = ov->value; */
}
/*DEBUG
@ -1912,6 +1924,7 @@ Fake_glXGetFBConfigs( Display *dpy, int screen, int *nelements )
for (i = 0; i < *nelements; i++) {
results[i] = create_glx_visual(dpy, visuals + i);
}
free(visuals);
return (GLXFBConfig *) results;
}
return NULL;