Use std::invalid_argument instead of InvalidParam

std::invalid_argument exception can perfectly replaced with
InvalidParam custom exception

Change-Id: I2734d73d1c44480b0b969cb0255fffcbb74dfb74
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/src/framework/client/handle.cpp b/src/framework/client/handle.cpp
index c663640..1553e1c 100644 (file)
--- a/src/framework/client/handle.cpp
+++ b/src/framework/client/handle.cpp
@@ -22,6 +22,7 @@
 #include "client/handle.h"
 
 #include <utility>
+#include <stdexcept>
 
 #include "common/exception.h"
 
@@ -32,7 +33,7 @@ Handle::Handle(SockId id, ContextShPtr &&context) :
        m_sockId(id), m_ctx(std::forward<ContextShPtr>(context))
 {
        if (!m_ctx)
-               ThrowExc(InvalidParam, "context shouldn't be null");
+               throw std::invalid_argument("context shouldn't be null");
 }
 
 Handle::~Handle()

diff --git a/src/framework/client/utils.cpp b/src/framework/client/utils.cpp
index 7b79d69..849f58e 100644 (file)
--- a/src/framework/client/utils.cpp
+++ b/src/framework/client/utils.cpp
@@ -43,7 +43,10 @@ int exceptionGuard(const std::function<int()> &func)
        } catch (const Exception &e) {
                ERROR("Exception caught. code: " << e.error() << " message: " << e.what());
                return e.error();
-       } catch (const std::bad_alloc &e) {
+       } catch (const std::invalid_argument &) {
+               ERROR("invalid argument.");
+               return CSR_ERROR_INVALID_PARAMETER;
+       } catch (const std::bad_alloc &) {
                ERROR("memory allocation failed.");
                return CSR_ERROR_OUT_OF_MEMORY;
        } catch (const std::exception &e) {

diff --git a/src/framework/common/cs-context.cpp b/src/framework/common/cs-context.cpp
index a132709..3e8bdd9 100644 (file)
--- a/src/framework/common/cs-context.cpp
+++ b/src/framework/common/cs-context.cpp
@@ -143,7 +143,7 @@ void CsContext::get(int key, std::string &value) const
 void CsContext::get(int key, const char **value) const
 {
        if (value == nullptr)
-               ThrowExc(InvalidParam, "output storage pointer is null.");
+               throw std::invalid_argument("output storage pointer is null.");
 
        switch (static_cast<Key>(key)) {
        case Key::PopupMessage:

diff --git a/src/framework/common/exception.h b/src/framework/common/exception.h
index 0c371be..9160d82 100644 (file)
--- a/src/framework/common/exception.h
+++ b/src/framework/common/exception.h
@@ -77,7 +77,6 @@ public:
        }
 };
 
-using InvalidParam       = DerivedException<CSR_ERROR_INVALID_PARAMETER>;
 using InternalError      = DerivedException<CSR_ERROR_SERVER>;
 using SocketError        = DerivedException<CSR_ERROR_SOCKET>;
 using FileDoNotExist     = DerivedException<CSR_ERROR_FILE_DO_NOT_EXIST>;

diff --git a/src/framework/common/wp-context.cpp b/src/framework/common/wp-context.cpp
index e7fda77..7626e58 100644 (file)
--- a/src/framework/common/wp-context.cpp
+++ b/src/framework/common/wp-context.cpp
@@ -119,7 +119,7 @@ void WpContext::get(int key, std::string &value) const
 void WpContext::get(int key, const char **value) const
 {
        if (value == nullptr)
-               ThrowExc(InvalidParam, "output storage pointer is null.");
+               throw std::invalid_argument("output storage pointer is null.");
 
        switch (static_cast<Key>(key)) {
        case Key::PopupMessage:

diff --git a/src/framework/service/cs-loader.cpp b/src/framework/service/cs-loader.cpp
index 6ac732b..37edb2e 100644 (file)
--- a/src/framework/service/cs-loader.cpp
+++ b/src/framework/service/cs-loader.cpp
@@ -21,6 +21,7 @@
  */
 #include "service/cs-loader.h"
 
+#include <stdexcept>
 #include <dlfcn.h>
 
 #include "common/audit/logger.h"
@@ -48,7 +49,7 @@ int CsLoader::globalInit(const std::string &ro_res_dir,
                                                 const std::string &rw_working_dir)
 {
        if (ro_res_dir.empty() || rw_working_dir.empty())
-               ThrowExc(InvalidParam, "cs loader global init");
+               throw std::invalid_argument("cs loader global init");
 
        return m_pc.fpGlobalInit(ro_res_dir.c_str(), rw_working_dir.c_str());
 }
@@ -66,7 +67,7 @@ int CsLoader::contextCreate(csre_cs_context_h &c)
 int CsLoader::contextDestroy(csre_cs_context_h c)
 {
        if (c == nullptr)
-               ThrowExc(InvalidParam, "cs loader context destroy");
+               throw std::invalid_argument("cs loader context destroy");
 
        return m_pc.fpContextDestroy(c);
 }
@@ -76,7 +77,7 @@ int CsLoader::scanData(csre_cs_context_h c,
                                           csre_cs_detected_h *pdetected)
 {
        if (c == nullptr || data.empty() || pdetected == nullptr)
-               ThrowExc(InvalidParam, "cs loader scan data");
+               throw std::invalid_argument("cs loader scan data");
 
        return m_pc.fpScanData(c, data.data(), data.size(), pdetected);
 }
@@ -85,7 +86,7 @@ int CsLoader::scanFile(csre_cs_context_h c, const std::string &filepath,
                                           csre_cs_detected_h *pdetected)
 {
        if (c == nullptr || filepath.empty() || pdetected == nullptr)
-               ThrowExc(InvalidParam, "cs loader scan file");
+               throw std::invalid_argument("cs loader scan file");
 
        return m_pc.fpScanFile(c, filepath.c_str(), pdetected);
 }
@@ -94,7 +95,7 @@ int CsLoader::scanAppOnCloud(csre_cs_context_h c, const std::string &appdir,
                                                         csre_cs_detected_h *pdetected)
 {
        if (c == nullptr || appdir.empty() || pdetected == nullptr)
-               ThrowExc(InvalidParam, "cs loader scan app on cloud");
+               throw std::invalid_argument("cs loader scan app on cloud");
 
        return m_pc.fpScanAppOnCloud(c, appdir.c_str(), pdetected);
 }
@@ -103,7 +104,7 @@ int CsLoader::getSeverity(csre_cs_detected_h d,
                                                  csre_cs_severity_level_e *pseverity)
 {
        if (d == nullptr || pseverity == nullptr)
-               ThrowExc(InvalidParam, "cs loader get severity");
+               throw std::invalid_argument("cs loader get severity");
 
        return m_pc.fpGetSeverity(d, pseverity);
 }
@@ -111,7 +112,7 @@ int CsLoader::getSeverity(csre_cs_detected_h d,
 int CsLoader::getMalwareName(csre_cs_detected_h d, std::string &value)
 {
        if (d == nullptr)
-               ThrowExc(InvalidParam, "cs loader get malware name");
+               throw std::invalid_argument("cs loader get malware name");
 
        return getValueCstr(value, [&](const char **cvalue) {
                return m_pc.fpGetMalwareName(d, cvalue);
@@ -121,7 +122,7 @@ int CsLoader::getMalwareName(csre_cs_detected_h d, std::string &value)
 int CsLoader::getDetailedUrl(csre_cs_detected_h d, std::string &value)
 {
        if (d == nullptr)
-               ThrowExc(InvalidParam, "cs loader get detailed url");
+               throw std::invalid_argument("cs loader get detailed url");
 
        return getValueCstr(value, [&](const char **cvalue) {
                return m_pc.fpGetDetailedUrl(d, cvalue);
@@ -131,7 +132,7 @@ int CsLoader::getDetailedUrl(csre_cs_detected_h d, std::string &value)
 int CsLoader::getTimestamp(csre_cs_detected_h d, time_t *timestamp)
 {
        if (d == nullptr || timestamp == nullptr)
-               ThrowExc(InvalidParam, "cs loader get time stamp");
+               throw std::invalid_argument("cs loader get time stamp");
 
        return m_pc.fpGetTimestamp(d, timestamp);
 }
@@ -156,7 +157,7 @@ int CsLoader::destroyEngine(csre_cs_engine_h e)
 int CsLoader::getEngineApiVersion(csre_cs_engine_h e, std::string &value)
 {
        if (e == nullptr)
-               ThrowExc(InvalidParam, "cs loader get error string");
+               throw std::invalid_argument("cs loader get error string");
 
        return getValueCstr(value, [&](const char **cvalue) {
                return m_pc.fpGetEngineApiVersion(e, cvalue);
@@ -166,7 +167,7 @@ int CsLoader::getEngineApiVersion(csre_cs_engine_h e, std::string &value)
 int CsLoader::getEngineVendor(csre_cs_engine_h e, std::string &value)
 {
        if (e == nullptr)
-               ThrowExc(InvalidParam, "cs loader get engine vendor");
+               throw std::invalid_argument("cs loader get engine vendor");
 
        return getValueCstr(value, [&](const char **cvalue) {
                return m_pc.fpGetEngineVendor(e, cvalue);
@@ -176,7 +177,7 @@ int CsLoader::getEngineVendor(csre_cs_engine_h e, std::string &value)
 int CsLoader::getEngineName(csre_cs_engine_h e, std::string &value)
 {
        if (e == nullptr)
-               ThrowExc(InvalidParam, "cs loader get engine name");
+               throw std::invalid_argument("cs loader get engine name");
 
        return getValueCstr(value, [&](const char **cvalue) {
                return m_pc.fpGetEngineName(e, cvalue);
@@ -186,7 +187,7 @@ int CsLoader::getEngineName(csre_cs_engine_h e, std::string &value)
 int CsLoader::getEngineVersion(csre_cs_engine_h e, std::string &value)
 {
        if (e == nullptr)
-               ThrowExc(InvalidParam, "cs loader get engine version");
+               throw std::invalid_argument("cs loader get engine version");
 
        return getValueCstr(value, [&](const char **cvalue) {
                return m_pc.fpGetEngineVersion(e, cvalue);
@@ -196,7 +197,7 @@ int CsLoader::getEngineVersion(csre_cs_engine_h e, std::string &value)
 int CsLoader::getEngineDataVersion(csre_cs_engine_h e, std::string &value)
 {
        if (e == nullptr)
-               ThrowExc(InvalidParam, "cs loader get engine version");
+               throw std::invalid_argument("cs loader get engine version");
 
        return getValueCstr(value, [&](const char **cvalue) {
                return m_pc.fpGetEngineDataVersion(e, cvalue);
@@ -206,7 +207,7 @@ int CsLoader::getEngineDataVersion(csre_cs_engine_h e, std::string &value)
 int CsLoader::getEngineLatestUpdateTime(csre_cs_engine_h e, time_t *ptime)
 {
        if (e == nullptr || ptime == nullptr)
-               ThrowExc(InvalidParam, "cs loader get latest update time");
+               throw std::invalid_argument("cs loader get latest update time");
 
        return m_pc.fpGetEngineLatestUpdateTime(e, ptime);
 }
@@ -215,7 +216,7 @@ int CsLoader::getEngineActivated(csre_cs_engine_h e,
                                                                 csre_cs_activated_e *pactivated)
 {
        if (e == nullptr || pactivated == nullptr)
-               ThrowExc(InvalidParam, "cs loader get engine activated");
+               throw std::invalid_argument("cs loader get engine activated");
 
        return m_pc.fpGetEngineActivated(e, pactivated);
 }
@@ -224,7 +225,7 @@ int CsLoader::getEngineVendorLogo(csre_cs_engine_h e,
                                                                  std::vector<unsigned char> &value)
 {
        if (e == nullptr)
-               ThrowExc(InvalidParam, "cs loader get engine vendor logo");
+               throw std::invalid_argument("cs loader get engine vendor logo");
 
        unsigned char *cvalue = nullptr;
        unsigned int size = 0;

diff --git a/src/framework/service/logic.cpp b/src/framework/service/logic.cpp
index 8a669df..f6c615f 100644 (file)
--- a/src/framework/service/logic.cpp
+++ b/src/framework/service/logic.cpp
@@ -21,6 +21,8 @@
  */
 #include "service/logic.h"
 
+#include <exception>
+
 #include "common/audit/logger.h"
 #include "service/exception.h"
 #include "csr/error.h"
@@ -35,6 +37,9 @@ RawBuffer Logic::exceptionGuard(const std::function<RawBuffer()> &func,
        } catch (const Exception &e) {
                ERROR("Exception caught. code: " << e.error() << " message: " << e.what());
                return closer(e.error());
+       } catch (const std::invalid_argument &) {
+               ERROR("Invalid argument.");
+               return closer(CSR_ERROR_INVALID_PARAMETER);
        } catch (const std::bad_alloc &) {
                ERROR("memory alloc failed.");
                return closer(CSR_ERROR_OUT_OF_MEMORY);

diff --git a/src/framework/service/thread-pool.cpp b/src/framework/service/thread-pool.cpp
index 51d69fa..7058e1c 100644 (file)
--- a/src/framework/service/thread-pool.cpp
+++ b/src/framework/service/thread-pool.cpp
@@ -23,6 +23,7 @@
 #include "service/thread-pool.h"
 
 #include <utility>
+#include <stdexcept>
 
 #include "common/audit/logger.h"
 #include "service/exception.h"
@@ -38,7 +39,7 @@ ThreadPool::ThreadPool(size_t min, size_t max) :
        m_stop(false)
 {
        if (m_min > m_max)
-               ThrowExc(InvalidParam, "thread pool MIN shouldn't be bigger than MAX");
+               throw std::invalid_argument("thread pool MIN shouldn't be bigger than MAX");
 
        for (size_t i = 0; i < m_min; i++)
                add();

diff --git a/src/framework/service/wp-loader.cpp b/src/framework/service/wp-loader.cpp
index bbcf1af..10b95d0 100644 (file)
--- a/src/framework/service/wp-loader.cpp
+++ b/src/framework/service/wp-loader.cpp
@@ -21,6 +21,7 @@
  */
 #include "service/wp-loader.h"
 
+#include <stdexcept>
 #include <dlfcn.h>
 
 #include "common/audit/logger.h"
@@ -48,7 +49,7 @@ int WpLoader::globalInit(const std::string &ro_res_dir,
                                                 const std::string &rw_working_dir)
 {
        if (ro_res_dir.empty() || rw_working_dir.empty())
-               ThrowExc(InvalidParam, "wp loader global init");
+               throw std::invalid_argument("wp loader global init");
 
        return m_pc.fpGlobalInit(ro_res_dir.c_str(), rw_working_dir.c_str());
 }
@@ -66,7 +67,7 @@ int WpLoader::contextCreate(csre_wp_context_h &c)
 int WpLoader::contextDestroy(csre_wp_context_h c)
 {
        if (c == nullptr)
-               ThrowExc(InvalidParam, "wp loader context destroy");
+               throw std::invalid_argument("wp loader context destroy");
 
        return m_pc.fpContextDestroy(c);
 }
@@ -75,7 +76,7 @@ int WpLoader::checkUrl(csre_wp_context_h c, const std::string &url,
                                           csre_wp_check_result_h *presult)
 {
        if (c == nullptr || url.empty() || presult == nullptr)
-               ThrowExc(InvalidParam, "wp loader check url error");
+               throw std::invalid_argument("wp loader check url error");
 
        return m_pc.fpCheckUrl(c, (const char *)url.c_str(), presult);
 }
@@ -84,7 +85,7 @@ int WpLoader::getRiskLevel(csre_wp_check_result_h r,
                                                   csre_wp_risk_level_e *plevel)
 {
        if (r == nullptr || plevel == nullptr)
-               ThrowExc(InvalidParam, "wp loader Get Risk Level error");
+               throw std::invalid_argument("wp loader Get Risk Level error");
 
        return m_pc.fpGetRiskLevel(r, plevel);
 }
@@ -92,7 +93,7 @@ int WpLoader::getRiskLevel(csre_wp_check_result_h r,
 int WpLoader::getDetailedUrl(csre_wp_check_result_h r, std::string &value)
 {
        if (r == nullptr)
-               ThrowExc(InvalidParam, "wp loader get detailed url error");
+               throw std::invalid_argument("wp loader get detailed url error");
 
        return getValueCstr(value, [&](const char **cvalue) {
                return m_pc.fpGetDetailedUrl(r, cvalue);
@@ -121,7 +122,7 @@ int WpLoader::destroyEngine(csre_wp_engine_h e)
 int WpLoader::getEngineApiVersion(csre_wp_engine_h e, std::string &value)
 {
        if (e == nullptr)
-               ThrowExc(InvalidParam, "wp loader get error string");
+               throw std::invalid_argument("wp loader get error string");
 
        return getValueCstr(value, [&](const char **cvalue) {
                return m_pc.fpGetEngineApiVersion(e, cvalue);
@@ -131,7 +132,7 @@ int WpLoader::getEngineApiVersion(csre_wp_engine_h e, std::string &value)
 int WpLoader::getEngineVendor(csre_wp_engine_h e, std::string &value)
 {
        if (e == nullptr)
-               ThrowExc(InvalidParam, "wp loader get engine vendor");
+               throw std::invalid_argument("wp loader get engine vendor");
 
        return getValueCstr(value, [&](const char **cvalue) {
                return m_pc.fpGetEngineVendor(e, cvalue);
@@ -141,7 +142,7 @@ int WpLoader::getEngineVendor(csre_wp_engine_h e, std::string &value)
 int WpLoader::getEngineName(csre_wp_engine_h e, std::string &value)
 {
        if (e == nullptr)
-               ThrowExc(InvalidParam, "wp loader get engine name");
+               throw std::invalid_argument("wp loader get engine name");
 
        return getValueCstr(value, [&](const char **cvalue) {
                return m_pc.fpGetEngineName(e, cvalue);
@@ -151,7 +152,7 @@ int WpLoader::getEngineName(csre_wp_engine_h e, std::string &value)
 int WpLoader::getEngineVersion(csre_wp_engine_h e, std::string &value)
 {
        if (e == nullptr)
-               ThrowExc(InvalidParam, "wp loader get engine version");
+               throw std::invalid_argument("wp loader get engine version");
 
        return getValueCstr(value, [&](const char **cvalue) {
                return m_pc.fpGetEngineVersion(e, cvalue);
@@ -161,7 +162,7 @@ int WpLoader::getEngineVersion(csre_wp_engine_h e, std::string &value)
 int WpLoader::getEngineDataVersion(csre_wp_engine_h e, std::string &value)
 {
        if (e == nullptr)
-               ThrowExc(InvalidParam, "wp loader get engine version");
+               throw std::invalid_argument("wp loader get engine version");
 
        return getValueCstr(value, [&](const char **cvalue) {
                return m_pc.fpGetEngineDataVersion(e, cvalue);
@@ -171,7 +172,7 @@ int WpLoader::getEngineDataVersion(csre_wp_engine_h e, std::string &value)
 int WpLoader::getEngineLatestUpdateTime(csre_wp_engine_h e, time_t *ptime)
 {
        if (e == nullptr || ptime == nullptr)
-               ThrowExc(InvalidParam, "wp loader get latest update time");
+               throw std::invalid_argument("wp loader get latest update time");
 
        return m_pc.fpGetEngineLatestUpdateTime(e, ptime);
 }
@@ -180,7 +181,7 @@ int WpLoader::getEngineActivated(csre_wp_engine_h e,
                                                                 csre_wp_activated_e *pactivated)
 {
        if (e == nullptr || pactivated == nullptr)
-               ThrowExc(InvalidParam, "wp loader get engine activated");
+               throw std::invalid_argument("wp loader get engine activated");
 
        return m_pc.fpGetEngineActivated(e, pactivated);
 }
@@ -189,7 +190,7 @@ int WpLoader::getEngineVendorLogo(csre_wp_engine_h e,
                                                                  std::vector<unsigned char> &value)
 {
        if (e == nullptr)
-               ThrowExc(InvalidParam, "wp loader get engine vendor logo");
+               throw std::invalid_argument("wp loader get engine vendor logo");
 
        unsigned char *cvalue = nullptr;
        unsigned int size = 0;