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

Always call dlopen in DriverOpen. 

This increases the reference count for the driver binary, preventing it from
getting unloaded prematurely in driDestroyDisplay. See
https://bugs.freedesktop.org/show_bug.cgi?id=13541 .
This commit is contained in:
George Nassas 2007-12-06 10:11:05 +01:00 committed by Michel Dänzer
parent 125bd4cae5
commit 17afc800c9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/glx/x11/dri_glx.c
View File

@ -194,7 +194,8 @@ static __DRIdriver *OpenDriver(const char *driverName)
/* First, search Drivers list to see if we've already opened this driver */ /* First, search Drivers list to see if we've already opened this driver */
for (driver = Drivers; driver; driver = driver->next) { for (driver = Drivers; driver; driver = driver->next) {
if (strcmp(driver->name, driverName) == 0) { if (strcmp(driver->name, driverName) == 0) {
/* found it */ /* found it, increment library refcount & return */
dlopen(driver->libpath, RTLD_NOW | RTLD_GLOBAL);
return driver; return driver;
} }
} }
@ -238,7 +239,9 @@ static __DRIdriver *OpenDriver(const char *driverName)
break; /* out of memory! */ break; /* out of memory! */
/* init the struct */ /* init the struct */
driver->name = __glXstrdup(driverName); driver->name = __glXstrdup(driverName);
if (!driver->name) { driver->libpath = __glXstrdup(realDriverName);
if (!driver->name || !driver->libpath) {
if (driver->name) XFree(driver->name);
Xfree(driver); Xfree(driver);
driver = NULL; driver = NULL;
break; /* out of memory! */ break; /* out of memory! */
@ -401,6 +404,7 @@ static void driDestroyDisplay(Display *dpy, void *private)
Drivers = driver->next; Drivers = driver->next;
Xfree(driver->name); Xfree(driver->name);
Xfree(driver->libpath);
Xfree(driver); Xfree(driver);
break; break;
} }

1
src/glx/x11/glxclient.h
View File

@ -117,6 +117,7 @@ struct __DRIdisplayRec {
*/ */
struct __DRIdriverRec { struct __DRIdriverRec {
const char *name; const char *name;
const char *libpath;
void *handle; void *handle;
PFNCREATENEWSCREENFUNC createNewScreenFunc; PFNCREATENEWSCREENFUNC createNewScreenFunc;
struct __DRIdriverRec *next; struct __DRIdriverRec *next;