1 files changed, 8 insertions, 3 deletions
diff --git a/parameter/SystemClass.cpp b/parameter/SystemClass.cpp
index 8ab7c94..effc573 100644
--- a/parameter/SystemClass.cpp
+++ b/parameter/SystemClass.cpp
@@ -42,6 +42,9 @@
 
 #define base CConfigurableElement
 
+using std::list;
+using std::string;
+
 /**
  * A plugin file name is of the form:
  * lib<type>-subsystem.so or lib<type>-subsystem._host.so
@@ -134,8 +137,10 @@ bool CSystemClass::loadSubsystemsFromSharedLibraries(list<string>& lstrError,
         // Get Folder for current Plugin Location
         const CPluginLocation* pPluginLocation = static_cast<const CPluginLocation*>(pSubsystemPlugins->getChild(uiPluginLocation));
 
-        const string& strFolder = pPluginLocation->getFolder();
-
+        string strFolder(pPluginLocation->getFolder());
+        if (!strFolder.empty()) {
+            strFolder += "/";
+        }
         // Iterator on Plugin List:
         list<string>::const_iterator it;
 
@@ -144,7 +149,7 @@ bool CSystemClass::loadSubsystemsFromSharedLibraries(list<string>& lstrError,
         for (it = pluginList.begin(); it != pluginList.end(); ++it) {
 
             // Fill Plugin files list
-            lstrPluginFiles.push_back(strFolder + "/" + *it);
+            lstrPluginFiles.push_back(strFolder + *it);
         }
     }