fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 08:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glx: Free all populated fields of the glx_display on creation failure

Browse source 
Add a common path to ensure that there is no copy-paste error.

CID: 1644424,1644409 Resource leak

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35474>
This commit is contained in:
Corentin Noël 2025-06-11 15:31:44 +02:00 • committed by Marge Bot
parent e3829eccc8
commit ad9db6b259
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/glx/glxext.c
View file

@ -1049,8 +1049,7 @@ __glXInitialize(Display * dpy)
if (glx_driver & GLX_DRIVER_ZINK_YES) {
/* only print error if zink was explicitly requested */
CriticalErrorMessageF("DRI3 not available\n");
free(dpyPriv);
return NULL;
goto init_fail;
}
/* if no dri3 and not using dri2, disable zink */
glx_driver &= ~GLX_DRIVER_ZINK_INFER;
@ -1068,10 +1067,8 @@ __glXInitialize(Display * dpy)
#endif
#if defined(GLX_USE_APPLEGL) && !defined(GLX_USE_APPLE)
if (!applegl_create_display(dpyPriv)) {
free(dpyPriv);
return NULL;
}
if (!applegl_create_display(dpyPriv))
goto init_fail;
#endif
if (!AllocAndFetchScreenConfigs(dpy, dpyPriv, glx_driver, !env)) {
@ -1081,10 +1078,8 @@ __glXInitialize(Display * dpy)
fail = !AllocAndFetchScreenConfigs(dpy, dpyPriv, GLX_DRIVER_SW, true);
}
#endif
if (fail) {
free(dpyPriv);
return NULL;
}
if (fail)
goto init_fail;
}
glxSendClientInfo(dpyPriv, -1);
@ -1107,6 +1102,14 @@ __glXInitialize(Display * dpy)
_XUnlockMutex(_Xglobal_lock);
return dpyPriv;
init_fail:
#if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE))
_mesa_set_destroy(dpyPriv->zombieGLXDrawable, free_zombie_glx_drawable);
__glxHashDestroy(dpyPriv->drawHash);
#endif
__glxHashDestroy(dpyPriv->glXDrawHash);
free(dpyPriv);
return NULL;
}
/*