Fix defects detected by static analysis tool

[platform/core/uifw/isf.git] / ism / modules / panelagent / ecoresocket / ecore_socket_panel_agent_module.cpp

diff --git a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
index 1f19192..38c4d29 100644 (file)
--- a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
+++ b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
@@ -922,8 +922,8 @@ private:
 
         if (trans.write_to_socket(client_socket)
             && trans.read_from_socket(client_socket)
-            && trans.get_command(cmd) && cmd == SCIM_TRANS_CMD_REPLY) {
-            trans.get_data(imdata, len);
+            && trans.get_command(cmd) && cmd == SCIM_TRANS_CMD_REPLY
+            && trans.get_data(imdata, len)) {
             LOGD ("length of imdata is %d", len);
         } else {
             LOGW ("read imdata failed");
@@ -1936,12 +1936,12 @@ private:
                         trans.put_data(ret);
                         trans.write_to_socket(client_socket);
 
-                        if (data != NULL)
-                            delete[] data;
-
                         if (ret)
                             m_info_manager->show_ise_panel(client_id, client, context, data, len);
 
+                        if (data != NULL)
+                            delete[] data;
+
                         continue;
                     } else if (cmd == ISM_TRANS_CMD_HIDE_ISE_PANEL) {
                         uint32 client;
@@ -2094,7 +2094,7 @@ private:
                     } else if (cmd == ISM_TRANS_CMD_GET_RETURN_KEY_DISABLE) {
                         uint32 disabled;
                         bool ret = true;
-                        m_info_manager->get_ise_return_key_disable(client_id, disabled);
+                        ret = m_info_manager->get_ise_return_key_disable(client_id, disabled);
                         Transaction trans;
                         Socket client_socket(client_id);
 
@@ -2702,6 +2702,24 @@ private:
                     } else {
                         LOGW ("wrong format of transaction");
                     }
+                } else if (cmd == ISM_TRANS_CMD_UPDATE_ISE_LANGUAGE_LOCALE) {
+                    String locale;
+
+                    char* data = NULL;
+                    size_t len;
+                    if (m_recv_trans.get_data(&data, len)) {
+                        if (data && len) {
+                            locale = String(data, len);
+                            m_info_manager->socket_helper_update_language_locale(client_id, locale);
+                        } else {
+                            LOGW("wrong format of transaction : %p %d", data, len);
+                        }
+                    } else {
+                        LOGW("wrong format of transaction");
+                    }
+
+                    if (data != NULL)
+                        delete [] data;
                 } else if (cmd == ISM_TRANS_CMD_GET_KEYBOARD_ISE_LIST) {
                     String uuid;
 
@@ -2933,7 +2951,6 @@ private:
                     if (m_info_manager->check_privilege_by_sockfd(client_id, IMEMANAGER_PRIVILEGE)) {
                         char*   buf = NULL;
                         size_t  len;
-                        bool ret = true;
 
                         //FIXME
                         //ret need be checked
@@ -2948,7 +2965,7 @@ private:
 
                         trans.clear();
                         trans.put_command(SCIM_TRANS_CMD_REPLY);
-                        trans.put_command(ret ? SCIM_TRANS_CMD_OK : SCIM_TRANS_CMD_FAIL);
+                        trans.put_command(SCIM_TRANS_CMD_OK);
                         trans.write_to_socket(client_socket);
 
                         if (NULL != buf)
@@ -3151,22 +3168,14 @@ private:
                     if (m_info_manager->check_privilege_by_sockfd(client_id, IMEMANAGER_PRIVILEGE)) {
                         String strAppid;
                         uint32 nEnabled = 0;
-                        bool ret = true;
-                        //FIXME
-                        //ret need be checked
+
                         m_info_manager->is_helper_ise_enabled(client_id, strAppid, nEnabled);
                         Transaction trans;
                         Socket client_socket(client_id);
                         trans.clear();
                         trans.put_command(SCIM_TRANS_CMD_REPLY);
-
-                        if (ret) {
-                            trans.put_command(SCIM_TRANS_CMD_OK);
-                            trans.put_data(static_cast<uint32>(nEnabled));
-                        } else {
-                            trans.put_command(SCIM_TRANS_CMD_FAIL);
-                        }
-
+                        trans.put_command(SCIM_TRANS_CMD_OK);
+                        trans.put_data(static_cast<uint32>(nEnabled));
                         trans.write_to_socket(client_socket);
                     }
                     else {