From 180272ed8628e2af038750ee2ddeea8d33b931a4 Mon Sep 17 00:00:00 2001 From: glx Date: Fri, 16 May 2008 21:32:10 +0000 Subject: (svn r13126) -Fix (r13022) [FS#2009, FS#2010]: driver list should be dynamically allocated as static uninitialistion order is undetermined. The list is freed when the latest driver is removed. --- src/driver.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/driver.h b/src/driver.h index 7d1a3429c..572e10cb0 100644 --- a/src/driver.h +++ b/src/driver.h @@ -43,7 +43,7 @@ private: static Drivers &GetDrivers() { - static Drivers s_drivers; + static Drivers &s_drivers = *new Drivers(); return s_drivers; } @@ -71,7 +71,14 @@ public: */ virtual ~DriverFactoryBase() { if (this->name == NULL) return; - GetDrivers().erase(this->name); + + /* Prefix the name with driver type to make it unique */ + char buf[32]; + strecpy(buf, GetDriverTypeName(type), lastof(buf)); + strecpy(buf + 5, this->name, lastof(buf)); + + GetDrivers().erase(buf); + if (GetDrivers().empty()) delete &GetDrivers(); free(this->name); } -- cgit v1.2.3-70-g09d2