PVS_V783 issue fixed.

Change-Id: Iaef50d10257f3f0e88fbebb175cb2676980b6338
Signed-off-by: cookie <cookie@samsung.com>

diff --git a/core/Config/Config.cpp b/core/Config/Config.cpp
index ea5d96685ff8f0b9497d87991f49654736d6af59..b7a328a24b7c4682e381fa94e11fa04c6dcb140a 100755 (executable)
--- a/core/Config/Config.cpp
+++ b/core/Config/Config.cpp
@@ -75,6 +75,7 @@ Config::Config()
 
     m_keysValues[CONFIG_KEY::URL_BAR_HEIGHT] = 108;
     m_keysValues[CONFIG_KEY::BOTTOM_BAR_HEIGHT] = 96;
+    m_keysValues[CONFIG_KEY::CONFIG_ERROR] = -1;
 }
 
 boost::any Config::get(const std::string& key)
@@ -84,7 +85,11 @@ boost::any Config::get(const std::string& key)
 
 const boost::any& Config::get(const CONFIG_KEY& key) const
 {
-    return m_keysValues.find(key)->second;
+    auto it = m_keysValues.find(key);
+    if (it != m_keysValues.end())
+        return m_keysValues.find(key)->second;
+    else
+        return m_keysValues.find(CONFIG_KEY::CONFIG_ERROR)->second;
 }
 
 void Config::set(const std::string & key, const boost::any & value)

diff --git a/core/Config/ConfigKey.h b/core/Config/ConfigKey.h
index 763832e56d61076ea5a0c68200e9a14a9ad3db13..1ce131ed02589247f5561137b34e2d5d1b360b9b 100755 (executable)
--- a/core/Config/ConfigKey.h
+++ b/core/Config/ConfigKey.h
@@ -39,7 +39,8 @@ enum class CONFIG_KEY
     DEFAULT_SEARCH_ENGINE,
     CURRENT_HOME_PAGE,
     URL_BAR_HEIGHT,
-    BOTTOM_BAR_HEIGHT
+    BOTTOM_BAR_HEIGHT,
+    CONFIG_ERROR = -1
 };
 
 #endif /* CONFIGKEY_H_ */

diff --git a/services/QuickAccess/QuickAccess.cpp b/services/QuickAccess/QuickAccess.cpp
index 7a14c9129a5b7dcd9984ae0c399d6b41625cf78b..40fe914471d2a11fc04089b626f1b1a77d65afd4 100755 (executable)
--- a/services/QuickAccess/QuickAccess.cpp
+++ b/services/QuickAccess/QuickAccess.cpp
@@ -568,8 +568,7 @@ void QuickAccess::_grid_mostVisited_del(void *data, Evas_Object *)
     BROWSER_LOGD("[%s:%d]", __PRETTY_FUNCTION__, __LINE__);
     if (data) {
         auto itemData = static_cast<HistoryItemData*>(data);
-        if (itemData)
-            delete itemData;
+        delete itemData;
     }
 }
 
@@ -740,13 +739,15 @@ void QuickAccess::setButtonColor(Evas_Object* button, int r, int g, int b, int a
 {
     // setting color of inner rect
     Edje_Message_Int_Set* msg = (Edje_Message_Int_Set *) malloc(sizeof(*msg) + 3 * sizeof(int));
-    msg->count = 4;
-    msg->val[0] = r;
-    msg->val[1] = g;
-    msg->val[2] = b;
-    msg->val[3] = a;
-    edje_object_message_send(elm_layout_edje_get(button), EDJE_MESSAGE_INT_SET, 0, msg);
-    free(msg);
+    if (msg) {
+        msg->count = 4;
+        msg->val[0] = r;
+        msg->val[1] = g;
+        msg->val[2] = b;
+        msg->val[3] = a;
+        edje_object_message_send(elm_layout_edje_get(button), EDJE_MESSAGE_INT_SET, 0, msg);
+        free(msg);
+    }
 }
 
 bool QuickAccess::canBeBacked(int tabCount)

diff --git a/services/SettingsUI/SettingsAFCreator.cpp b/services/SettingsUI/SettingsAFCreator.cpp
index afc980e82b7ab5b57fdba5704105e557452dc45a..c8663d55c67d0108916060974cdc16ff2c06e0ae 100755 (executable)
--- a/services/SettingsUI/SettingsAFCreator.cpp
+++ b/services/SettingsUI/SettingsAFCreator.cpp
@@ -91,7 +91,7 @@ void SettingsAFCreator::unregisterCallbacksForEditfield(Evas_Object* editfield)
     evas_object_smart_callback_del(button, "clicked", __entry_clear_button_clicked_cb);
 }
 
-bool SettingsAFCreator::loadProfile(void)
+void SettingsAFCreator::loadProfile(void)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
 
@@ -108,16 +108,14 @@ bool SettingsAFCreator::loadProfile(void)
     }
 
     createNewAutoFillFormItem();
-
-    return false;
 }
 
 void SettingsAFCreator::createNewAutoFillFormItem()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if (!m_profile)
+    if (!m_profile) {
         m_item  = std::make_shared<AutoFillFormItem>(nullptr);
-    else {
+    } else {
         auto item_data = new AutoFillFormItemData;
         if (!item_data) {
             BROWSER_LOGE("Malloc failed to get item_data");

diff --git a/services/SettingsUI/SettingsAFCreator.h b/services/SettingsUI/SettingsAFCreator.h
index 21d971620d5471f42e11d33490e5680b970df761..39c76a6a74c8a6d0046b4d26b0f169c6f93ef126 100755 (executable)
--- a/services/SettingsUI/SettingsAFCreator.h
+++ b/services/SettingsUI/SettingsAFCreator.h
@@ -41,7 +41,7 @@ public:
     virtual ~SettingsAFCreator();
     virtual bool populateLayout(Evas_Object* genlist);
     Evas_Object* createScroller(Evas_Object *parent);
-    bool loadProfile(void);
+    void loadProfile(void);
     void createNewAutoFillFormItem();
 private:
     Eina_Bool isEntryHasOnlySpace(const char* field);

diff --git a/services/SettingsUI/SettingsUI.cpp b/services/SettingsUI/SettingsUI.cpp
index e1814b887cc22e9b205e2c86bc3f556c1909232c..876129c6c47654fcd2b7c22d7d9d8e93a51e98f5 100755 (executable)
--- a/services/SettingsUI/SettingsUI.cpp
+++ b/services/SettingsUI/SettingsUI.cpp
@@ -76,11 +76,11 @@ void SettingsUI::init()
     m_edjFilePath.append("SettingsUI/SettingsMobileUI.edj");
     elm_theme_extension_add(nullptr, m_edjFilePath.c_str());
 
-    m_setting_item_class = createItemClass("type1",_gengrid_item_text_get);
-    m_setting_double_item_class = createItemClass("type1",_gengrid_item_text_get);
-    m_setting_check_on_of_item_class = createItemClass("type1",_gengrid_item_text_get, _gengrid_item_content_onoff_get);
-    m_setting_check_normal_item_class = createItemClass("type1",_gengrid_item_text_get, _gengrid_item_content_normal_get);
-    m_setting_check_radio_item_class = createItemClass("type1",_gengrid_item_text_get, _gengrid_item_content_radio_get);
+    m_setting_item_class = createItemClass("type1", _gengrid_item_text_get);
+    m_setting_double_item_class = createItemClass("type1", _gengrid_item_text_get);
+    m_setting_check_on_of_item_class = createItemClass("type1", _gengrid_item_text_get, _gengrid_item_content_onoff_get);
+    m_setting_check_normal_item_class = createItemClass("type1", _gengrid_item_text_get, _gengrid_item_content_normal_get);
+    m_setting_check_radio_item_class = createItemClass("type1", _gengrid_item_text_get, _gengrid_item_content_radio_get);
 }
 
 void SettingsUI::init(Evas_Object* parent)
@@ -192,7 +192,7 @@ void SettingsUI::orientationChanged()
         }
     } else {
         if (m_items_layout) {
-            elm_object_signal_emit(m_items_layout,"rotation,portrait,main", "rot");
+            elm_object_signal_emit(m_items_layout, "rotation,portrait,main", "rot");
         }
     }
 }
@@ -224,12 +224,10 @@ char* SettingsUI::_gengrid_item_text_get(void* data, Evas_Object*, const char* p
 
    if (strcmp(part, "elm.text") == 0) {
        const char* item_name = it->buttonText.c_str();
-       if (item_name)
-           return strdup(item_name);
+       return strdup(item_name);
    } else if (strcmp(part, "elm.text.sub") == 0 && !(it->subText.empty())) {
        const char* item_name = it->subText.c_str();
-       if (item_name)
-           return strdup(item_name);
+       return strdup(item_name);
    }
    return nullptr;
 }

diff --git a/services/TabService/TabService.cpp b/services/TabService/TabService.cpp
index 9919f965795bcd526369e2516dd9461d7d3ff679..efbc4123a86eb2f1a4aecbe36bd606a53d9d1611 100755 (executable)
--- a/services/TabService/TabService.cpp
+++ b/services/TabService/TabService.cpp
@@ -149,7 +149,16 @@ boost::optional<tools::BrowserImagePtr> TabService::getThumbCache(
 {
     if (!thumbCached(tabId))
         return boost::none;
-    return m_thumbMap.find(tabId.get())->second;
+
+    if (tabId.get()) {
+        auto it = m_thumbMap.find(tabId.get());
+        if (it != m_thumbMap.end())
+            return m_thumbMap.find(tabId.get())->second;
+        else
+            return boost::none;
+    } else {
+        return boost::none;
+    }
 }
 
 boost::optional<tools::BrowserImagePtr> TabService::getFaviconCache(
@@ -157,7 +166,16 @@ boost::optional<tools::BrowserImagePtr> TabService::getFaviconCache(
 {
     if (!faviconCached(tabId))
         return boost::none;
-    return m_faviconMap.find(tabId.get())->second;
+
+    if (tabId.get()) {
+        auto it = m_faviconMap.find(tabId.get());
+        if (it != m_faviconMap.end())
+            return m_faviconMap.find(tabId.get())->second;
+        else
+            return boost::none;
+    } else {
+        return boost::none;
+    }
 }
 
 void TabService::removeTab(const basic_webengine::TabId& tabId)
@@ -283,7 +301,7 @@ void TabService::saveThumbDatabase(
         BROWSER_LOGW("getBlobPNG failed");
         return;
     }
-    auto thumbData = const_cast<unsigned char*>( static_cast<const unsigned char*>(thumb_blob->getData()));
+    auto thumbData = const_cast<unsigned char*>(static_cast<const unsigned char*>(thumb_blob->getData()));
     if (bp_tab_adaptor_set_snapshot(
         tabId.get(),
         imagePtr->getWidth(),

diff --git a/services/WebPageUI/WebPageUIStatesManager.cpp b/services/WebPageUI/WebPageUIStatesManager.cpp
index 0bd2b3af16689193211a04cfefcca26a9c5f8c47..07d3ce3c06bf26d278b7ff028f03a807c63da0aa 100755 (executable)
--- a/services/WebPageUI/WebPageUIStatesManager.cpp
+++ b/services/WebPageUI/WebPageUIStatesManager.cpp
@@ -50,7 +50,11 @@ bool WebPageUIStatesManager::equals(std::initializer_list<WPUState> states) cons
 
 std::string WebPageUIStatesManager::toString(WPUState state) const
 {
-    return namesMap.find(state)->second;
+    auto it = namesMap.find(state);
+    if (it != namesMap.end())
+        return namesMap.find(state)->second;
+    else
+        return "";
 }
 
 } /* namespace base_ui */