XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 03:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xext/dri2: Fix small memory leak.

Browse Source 
Fixes: https://github.com/X11Libre/xserver/pull/1414
Fixes: https://github.com/X11Libre/xserver/issues/1413
(Fixes the small leak that was mentioned there,
not sure if there isn't a bigger one somewhere else)

Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
stefan11111
2026-01-02 19:25:39 +02:00
committed by Enrico Weigelt
parent 984f403a17
commit 5d3490d135
1 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Xext/dri2/dri2.c
View File

@@ -1612,18 +1612,34 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
goto err_out;
if (info->driverName) {
ds->driverNames[0] = info->driverName;
ds->driverNames[0] = strdup(info->driverName);
if (!ds->driverNames[0]) {
free(ds->driverNames);
ds->driverNames = NULL;
goto err_out;
}
} else {
/* FIXME dri2_probe_driver_name() returns a strdup-ed string,
* currently this gets leaked */
ds->driverNames[0] = ds->driverNames[1] = dri2_probe_driver_name(pScreen, info);
if (!ds->driverNames[0])
return FALSE;
ds->driverNames[0] = dri2_probe_driver_name(pScreen, info);
if (!ds->driverNames[0]) {
free(ds->driverNames);
ds->driverNames = NULL;
goto err_out;
}
/* There is no VDPAU driver for i965, fallback to the generic
* OpenGL/VAAPI va_gl backend to emulate VDPAU on i965. */
if (strcmp(ds->driverNames[0], "i965") == 0)
ds->driverNames[1] = "va_gl";
if (strcmp(ds->driverNames[0], "i965") == 0) {
ds->driverNames[1] = strdup("va_gl");
} else {
ds->driverNames[1] = strdup(ds->driverNames[0]);
}
if (!ds->driverNames[1]) {
free((void*)ds->driverNames[0]);
free(ds->driverNames);
ds->driverNames = NULL;
goto err_out;
}
}
}
else {
@@ -1671,7 +1687,12 @@ DRI2CloseScreen(ScreenPtr pScreen)
if (ds->prime_id)
prime_id_allocate_bitmask &= ~(1 << ds->prime_id);
free(ds->driverNames);
if (ds->driverNames) {
for (int i = 0; i < ds->numDrivers; i++) {
free((void*)ds->driverNames[i]);
}
free(ds->driverNames);
}
free(ds);
dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, NULL);
}