From: Daniel Czarnowski <daniel.czarnow...@intel.com> 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. Signed-off-by: Matt Roper <matthew.d.ro...@intel.com> Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> Cc: "11.2" <mesa-sta...@lists.freedesktop.org> --- src/glx/glxcmds.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index bff01d2..4bc7fc4 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -1629,8 +1629,35 @@ _X_EXPORT GLXContext glXCreateNewContext(Display * dpy, GLXFBConfig fbconfig, int renderType, GLXContext shareList, Bool allowDirect) { + int list_size; struct glx_config *config = (struct glx_config *) fbconfig; + if (!config) + { + __glXSendError(dpy, GLXBadFBConfig, 0, X_GLXCreateNewContext, false); + return NULL; + } + + int screen = XDefaultScreen(dpy); + struct glx_config **config_list = (struct glx_config **) + glXGetFBConfigs(dpy, screen, &list_size); + + int i; + 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, config->screen); -- 2.5.5 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev