From 30095b3c0b84e85caf253a27e41254eaf35e4ca7 Mon Sep 17 00:00:00 2001
From: Eduardo Mendi <eduardox.mendi@intel.com>
Date: Tue, 15 Apr 2014 17:29:52 +0200
Subject: Fix KW10 issues

BZ: 186081

Due to upgrade klocwork (KW version from 9.6 to 10.0)
new issues have been raised.

This patch fix the new issues raised in PFW.

Change-Id: I54c14e4d6da1c9a5f8d82aec1769a9e7e948db50
Signed-off-by: Eduardo Mendi <eduardox.mendi@intel.com>
---
 parameter/Element.cpp         | 8 ++++++--
 parameter/SubsystemObject.cpp | 8 ++++++--
 parameter/SystemClass.cpp     | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'parameter')

diff --git a/parameter/Element.cpp b/parameter/Element.cpp
index e5987e1..6d1d418 100755
--- a/parameter/Element.cpp
+++ b/parameter/Element.cpp
@@ -58,7 +58,9 @@ void CElement::log_info(const string& strMessage, ...) const
 
     va_end(listPointer);
 
-    doLog(false, pacBuffer);
+    if (pacBuffer != NULL) {
+        doLog(false, pacBuffer);
+    }
 
     free(pacBuffer);
 }
@@ -74,7 +76,9 @@ void CElement::log_warning(const string& strMessage, ...) const
 
     va_end(listPointer);
 
-    doLog(true, pacBuffer);
+    if (pacBuffer != NULL) {
+        doLog(true, pacBuffer);
+    }
 
     free(pacBuffer);
 }
diff --git a/parameter/SubsystemObject.cpp b/parameter/SubsystemObject.cpp
index fd263c6..fb635c8 100755
--- a/parameter/SubsystemObject.cpp
+++ b/parameter/SubsystemObject.cpp
@@ -222,7 +222,9 @@ void CSubsystemObject::log_info(const string& strMessage, ...) const
 
     va_end(listPointer);
 
-    _pInstanceConfigurableElement->log_info(pacBuffer);
+    if (pacBuffer != NULL) {
+        _pInstanceConfigurableElement->log_info(pacBuffer);
+    }
 
     free(pacBuffer);
 }
@@ -238,7 +240,9 @@ void CSubsystemObject::log_warning(const string& strMessage, ...) const
 
     va_end(listPointer);
 
-    _pInstanceConfigurableElement->log_warning(pacBuffer);
+    if (pacBuffer != NULL) {
+        _pInstanceConfigurableElement->log_warning(pacBuffer);
+    }
 
     free(pacBuffer);
 }
diff --git a/parameter/SystemClass.cpp b/parameter/SystemClass.cpp
index e4fab19..8ab7c94 100644
--- a/parameter/SystemClass.cpp
+++ b/parameter/SystemClass.cpp
@@ -219,9 +219,13 @@ bool CSystemClass::loadPlugins(list<string>& lstrPluginFiles, list<string>& lstr
 
         if (!lib_handle) {
 
+            const char *err = dlerror();
             // Failed
-            lstrError.push_back("Plugin load failed: " + string(dlerror()));
-
+            if (err == NULL) {
+                lstrError.push_back("dlerror failed");
+            } else {
+                lstrError.push_back("Plugin load failed: " + string(err));
+            }
             // Next plugin
             ++it;
 
-- 
cgit v1.1