KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glx: fix possible memory leaks in dri2CreateScreen() 

Original patch fixed up by Brian Paul.
This commit is contained in:
Rodolfo Ribeiro Gomes 2010-01-29 08:36:47 -07:00 committed by Brian Paul
parent 4886f677ec
commit 81cca6d453
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/glx/x11/dri2_glx.c
View File

@ -504,8 +504,10 @@ dri2CreateScreen(__GLXscreenConfigs * psc, int screen,
psc->ext_list_first_time = GL_TRUE;
if (!DRI2Connect(psc->dpy, RootWindow(psc->dpy, screen),
&driverName, &deviceName))
&driverName, &deviceName)) {
XFree(psp);
return NULL;
}
psc->driver = driOpenDriver(driverName);
if (psc->driver == NULL) {
@ -534,17 +536,17 @@ dri2CreateScreen(__GLXscreenConfigs * psc, int screen,
psc->fd = open(deviceName, O_RDWR);
if (psc->fd < 0) {
ErrorMessageF("failed to open drm device: %s\n", strerror(errno));
return NULL;
goto handle_error;
}
if (drmGetMagic(psc->fd, &magic)) {
ErrorMessageF("failed to get magic\n");
return NULL;
goto handle_error;
}
if (!DRI2Authenticate(psc->dpy, RootWindow(psc->dpy, screen), magic)) {
ErrorMessageF("failed to authenticate magic %d\n", magic);
return NULL;
goto handle_error;
}
/* If the server does not support the protocol for
@ -558,7 +560,7 @@ dri2CreateScreen(__GLXscreenConfigs * psc, int screen,
if (psc->__driScreen == NULL) {
ErrorMessageF("failed to create dri screen\n");
return NULL;
goto handle_error;
}
driBindCommonExtensions(psc);
@ -602,6 +604,7 @@ dri2CreateScreen(__GLXscreenConfigs * psc, int screen,
handle_error:
Xfree(driverName);
Xfree(deviceName);
XFree(psp);
/* FIXME: clean up here */