vasprintf fails by returning -1

int vasprintf(char **strp, const char *fmt, va_list ap)
return -1 on failure, not by setting strp to NULL.

Replace check for NULL by checking for -1 return.

Signed-off-by: Kevin Rocard <kevinx.rocard@intel.com>

Author: krocard

parameter/Element.cpp

@@ -56,13 +56,13 @@ void CElement::log_info(const string& strMessage, ...) const
 
     va_start(listPointer, strMessage);
 
-    vasprintf(&pacBuffer,  strMessage.c_str(), listPointer);
+    if (vasprintf(&pacBuffer,  strMessage.c_str(), listPointer) == -1) {
+        return doLog(true, "Unable to format info log: " + strMessage);
+    }
 
     va_end(listPointer);
 
-    if (pacBuffer != NULL) {
-        doLog(false, pacBuffer);
-    }
+    doLog(false, pacBuffer);
 
     free(pacBuffer);
 }
@@ -74,13 +74,13 @@ void CElement::log_warning(const string& strMessage, ...) const
 
     va_start(listPointer, strMessage);
 
-    vasprintf(&pacBuffer,  strMessage.c_str(), listPointer);
+    if (vasprintf(&pacBuffer,  strMessage.c_str(), listPointer) == -1) {
+        return doLog(true, "Unable to format warning: " + strMessage);
+    }
 
     va_end(listPointer);
 
-    if (pacBuffer != NULL) {
-        doLog(true, pacBuffer);
-    }
+    doLog(true, pacBuffer);
 
     free(pacBuffer);
 }

parameter/SubsystemObject.cpp

@@ -220,13 +220,14 @@ void CSubsystemObject::log_info(const string& strMessage, ...) const
 
     va_start(listPointer, strMessage);
 
-    vasprintf(&pacBuffer,  strMessage.c_str(), listPointer);
+    if (vasprintf(&pacBuffer,  strMessage.c_str(), listPointer) == -1) {
+        return _pInstanceConfigurableElement->log_warning(
+                "Unable to format warning: " + strMessage);
+    }
 
     va_end(listPointer);
 
-    if (pacBuffer != NULL) {
-        _pInstanceConfigurableElement->log_info(pacBuffer);
-    }
+    _pInstanceConfigurableElement->log_info(pacBuffer);
 
     free(pacBuffer);
 }
@@ -238,13 +239,14 @@ void CSubsystemObject::log_warning(const string& strMessage, ...) const
 
     va_start(listPointer, strMessage);
 
-    vasprintf(&pacBuffer,  strMessage.c_str(), listPointer);
+    if (vasprintf(&pacBuffer,  strMessage.c_str(), listPointer) == -1) {
+        return _pInstanceConfigurableElement->log_warning(
+                "Unable to format warning: " + strMessage);
+    }
 
     va_end(listPointer);
 
-    if (pacBuffer != NULL) {
-        _pInstanceConfigurableElement->log_warning(pacBuffer);
-    }
+    _pInstanceConfigurableElement->log_warning(pacBuffer);
 
     free(pacBuffer);
 }