Skip to content

dri2: fix old memory leak during screen init with i965 #1414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −5
Open

dri2: fix old memory leak during screen init with i965 #1414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions hw/xfree86/dri2/dri2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,16 +1609,18 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
if (info->driverName) {
ds->driverNames[0] = info->driverName;
} 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])
char *driver_name = dri2_probe_driver_name(pScreen, info);

if (!driver_name)
return FALSE;

ds->driverNames[0] = driver_name;
/* 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)
if (strcmp(driver_name, "i965") == 0)
ds->driverNames[1] = "va_gl";
else
ds->driverNames[1] = driver_name;
}
}
else {
Expand Down