Fix svace defects

- UNINIT.CTOR
- DEREF_OF_NULL.EX
- SIMILAR_BRANCHES

Change-Id: I3389cfe7d5ac89ca0f7e215e2d938c930f7be241
Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>

diff --git a/src/osquery/sql/sqlite_util.cpp b/src/osquery/sql/sqlite_util.cpp
index 9656324002714a87cb63e30342bddc2222502698..38214383ed1837a439cdc04b8f158c369ca01a63 100644 (file)
--- a/src/osquery/sql/sqlite_util.cpp
+++ b/src/osquery/sql/sqlite_util.cpp
@@ -587,6 +587,9 @@ Status queryInternal(const std::string& query,
                                         QueryDataTyped& results,
                                         const SQLiteDBInstanceRef& instance)
 {
+       if (query.empty())
+               return Status::failure("Query cannot be empty.");
+
        sqlite3_stmt* prepared_statement{nullptr}; /* Statement to execute. */
 
        int rc = SQLITE_OK; /* Return Code */

diff --git a/src/osquery/utils/conversions/to.h b/src/osquery/utils/conversions/to.h
index b12a443d8afc5b6b32936a01b960b6b18ea1415c..7285a86f4270a2874a77bff754bea2d7bfe72f8a 100644 (file)
--- a/src/osquery/utils/conversions/to.h
+++ b/src/osquery/utils/conversions/to.h
@@ -26,11 +26,11 @@ namespace osquery {
  * to<std::string>(En::First) -> "En::First[1]"
  */
 template <typename ToType, typename FromType>
-inline typename std::enable_if < std::is_enum<FromType>::value&&
-std::is_same<ToType, std::string>::value,
-       ToType >::type
+inline typename std::enable_if <std::is_same<ToType, std::string>::value, ToType >::type
        to(FromType from) noexcept
 {
+       static_assert(std::is_enum<FromType>::value, "FromType must be enum type.");
+
        auto str = ToType{boost::core::demangle(typeid(from).name())};
        str.append("[");
        str.append(std::to_string(

diff --git a/src/vist/result.hpp b/src/vist/result.hpp
index ecfa73e69720f1a410acbc6684d50f1ad48d12a7..8e857bc6894a5692718d9532ae3b1a8e11531273 100644 (file)
--- a/src/vist/result.hpp
+++ b/src/vist/result.hpp
@@ -78,7 +78,7 @@ public:
 
 private:
        Value value;
-       ErrCode ec;
+       ErrCode ec = static_cast<ErrCode>(0);
        bool isError = false;
 };
 

diff --git a/src/vist/rmi/impl/mainloop.cpp b/src/vist/rmi/impl/mainloop.cpp
index 1b776ae6dc7a73b0501363c871b5cb8232369535..4baadbf599af54b0292ce1bd5a8d11e04ee018cd 100644 (file)
--- a/src/vist/rmi/impl/mainloop.cpp
+++ b/src/vist/rmi/impl/mainloop.cpp
@@ -34,6 +34,10 @@ Mainloop::Mainloop() :
 {
        if (epollFd == -1)
                THROW(ErrCode::RuntimeError) << "Failed to create epoll instance.";
+
+       ::epoll_event event;
+       std::memset(&event, 0, sizeof(epoll_event));
+       events.fill(event);
 }
 
 Mainloop::~Mainloop()