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:
parent
125bd4cae5
commit
17afc800c9
|
@ -194,7 +194,8 @@ static __DRIdriver *OpenDriver(const char *driverName)
|
|||
/* First, search Drivers list to see if we've already opened this driver */
|
||||
for (driver = Drivers; driver; driver = driver->next) {
|
||||
if (strcmp(driver->name, driverName) == 0) {
|
||||
/* found it */
|
||||
/* found it, increment library refcount & return */
|
||||
dlopen(driver->libpath, RTLD_NOW | RTLD_GLOBAL);
|
||||
return driver;
|
||||
}
|
||||
}
|
||||
|
@ -238,7 +239,9 @@ static __DRIdriver *OpenDriver(const char *driverName)
|
|||
break; /* out of memory! */
|
||||
/* init the struct */
|
||||
driver->name = __glXstrdup(driverName);
|
||||
if (!driver->name) {
|
||||
driver->libpath = __glXstrdup(realDriverName);
|
||||
if (!driver->name || !driver->libpath) {
|
||||
if (driver->name) XFree(driver->name);
|
||||
Xfree(driver);
|
||||
driver = NULL;
|
||||
break; /* out of memory! */
|
||||
|
@ -401,6 +404,7 @@ static void driDestroyDisplay(Display *dpy, void *private)
|
|||
Drivers = driver->next;
|
||||
|
||||
Xfree(driver->name);
|
||||
Xfree(driver->libpath);
|
||||
Xfree(driver);
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -117,6 +117,7 @@ struct __DRIdisplayRec {
|
|||
*/
|
||||
struct __DRIdriverRec {
|
||||
const char *name;
|
||||
const char *libpath;
|
||||
void *handle;
|
||||
PFNCREATENEWSCREENFUNC createNewScreenFunc;
|
||||
struct __DRIdriverRec *next;
|
||||
|
|
Loading…
Reference in New Issue