OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: fix crash with bad fbconfig

Browse Source 
GLX documentation states:
	glXCreateNewContext can generate the following errors: (...)
	GLXBadFBConfig if config is not a valid GLXFBConfig

Function checks if the given config is a valid config and sets proper
error code.

Fixes currently crashing glx-fbconfig-bad Piglit test.

v2: coding style cleanups (Emil, Topi)
    use DefaultScreen macro (Emil)

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Cc: "11.2" <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Daniel Czarnowski
2016-02-10 09:36:05 -08:00
committed by Tapani Pälli
parent 2d140ae70a
commit cf804b4455
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/glx/glxcmds.c
View File

@@ -1630,6 +1630,29 @@ glXCreateNewContext(Display * dpy, GLXFBConfig fbconfig,
int renderType, GLXContext shareList, Bool allowDirect)
{
struct glx_config *config = (struct glx_config *) fbconfig;
int screen = DefaultScreen(dpy);
struct glx_config **config_list;
int list_size;
unsigned i;
if (!config) {
__glXSendError(dpy, GLXBadFBConfig, 0, X_GLXCreateNewContext, false);
return NULL;
}
config_list = (struct glx_config **)
glXGetFBConfigs(dpy, screen, &list_size);
for (i = 0; i < list_size; i++) {
if (config_list[i] == config)
break;
}
free(config_list);
if (i == list_size) {
__glXSendError(dpy, GLXBadFBConfig, 0, X_GLXCreateNewContext, false);
return NULL;
}
return CreateContext(dpy, config->fbconfigID, config, shareList,
allowDirect, X_GLXCreateNewContext, renderType,