[Common][ML] Fixing SVACE issues and code formatting

[SVACE] 1222586, 1222593

[Verification] Code compiles without errors.

Change-Id: Ibf34be9edb25f1b4e61e8480c9b6ad42262d42a4

diff --git a/src/common/converter.h b/src/common/converter.h
index 5ba7a6b..db0955d 100644 (file)
--- a/src/common/converter.h
+++ b/src/common/converter.h
@@ -59,8 +59,8 @@ const T &FromJson(const picojson::object &in, const char *name, Names... names)
   return FromJson<T>(v.get<picojson::object>(), names...);
 }
 
-void encode_binary_in_string(const std::vector<std::uint8_t>& buf, std::string& str);
-void decode_binary_from_string(const std::string& str, std::vector<std::uint8_t>& buf);
+void encode_binary_in_string(const std::vector<std::uint8_t> &buf, std::string &str);
+void decode_binary_from_string(const std::string &str, std::vector<std::uint8_t> &buf);
 
 }  // common
 

diff --git a/src/common/picojson.h b/src/common/picojson.h
index 54a40a7..83b6e93 100644 (file)
--- a/src/common/picojson.h
+++ b/src/common/picojson.h
@@ -916,7 +916,7 @@ inline bool _parse(Context &ctx, input<Iter> &in) {
           }
         }
 #endif
-        locale_t loc = newlocale(LC_NUMERIC_MASK, "C", (locale_t) 0);
+        locale_t loc = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0);
         f = strtod_l(num_str.c_str(), &endp, loc);
         freelocale(loc);
         if (endp == num_str.c_str() + num_str.size()) {

diff --git a/src/common/tools.cc b/src/common/tools.cc
index 21f28b9..9e9368e 100644 (file)
--- a/src/common/tools.cc
+++ b/src/common/tools.cc
@@ -165,6 +165,10 @@ class AccessControlImpl {
     ScopeLogger("Privilege access checked using Cynara.");
 
     char* smack_label = nullptr;
+    SCOPE_EXIT {
+      free(smack_label);
+    };
+
     char path[1024] = {
         0,
     };
@@ -179,8 +183,6 @@ class AccessControlImpl {
 
       uid_ = std::to_string(uid);
       smack_label_ = smack_label;
-
-      free(smack_label);
     } else {
       LoggerE("Failed to get smack label");
       return;

diff --git a/src/ml/ml_pipeline_nodeinfo.cc b/src/ml/ml_pipeline_nodeinfo.cc
index d01f997..3132d93 100644 (file)
--- a/src/ml/ml_pipeline_nodeinfo.cc
+++ b/src/ml/ml_pipeline_nodeinfo.cc
@@ -57,7 +57,7 @@ PlatformResult NodeInfo::CreateNodeInfo(ml_pipeline_h pipeline, const std::strin
   return PlatformResult{};
 }
 
-NodeInfo::NodeInfo(const std::string& name) : name_{name} {
+NodeInfo::NodeInfo(const std::string& name) : name_{name}, node_info_{nullptr} {
   ScopeLogger("name: [%s] ", name.c_str());
 }