Fix svace issue

Change-Id: I000b349630cdeec968f0c1cf5ed066a4d67a3da5

diff --git a/packaging/tel-plugin-manager.spec b/packaging/tel-plugin-manager.spec
index 500b6d4..4b4f830 100644 (file)
--- a/packaging/tel-plugin-manager.spec
+++ b/packaging/tel-plugin-manager.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 5
+%define patchlevel 6
 
 Name:           tel-plugin-manager
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/manager_call.c b/src/manager_call.c
old mode 100755 (executable)
new mode 100644 (file)
index 7b9d2c0..6f02b9b
--- a/src/manager_call.c
+++ b/src/manager_call.c
@@ -640,6 +640,8 @@ static enum tcore_manager_return manager_call_silent_redial(CoreObject *co_call,
 
        plugin = tcore_object_ref_plugin(co_call);
        arg = g_malloc0(sizeof(struct silent_redial_hook_arg));
+       if (!arg)
+               return TCORE_MANAGER_RETURN_FAILURE;
 
        if ((TFEATURE_SUPPORTED == tfeature_is_supported(TFEATURE_FUNCTION_NET_CHECK_ECC_RAT)) &&
            (TCORE_CALL_TYPE_E911 == tcore_call_object_get_type(call_obj)) &&
@@ -1543,6 +1545,10 @@ gboolean manager_call_initialize_private_info(ModemBoard *mb)
                manager_call_clear_private_info(mb);
 
        mb->call_info = g_try_malloc0(sizeof(struct manager_call_private_info));
+       if(mb->call_info == NULL) {
+               err("Memory alloc failed");
+               return FALSE;
+       }
 
        cpi = mb->call_info;
        cpi->rat_query_cache.call_handle = INVALID_HANDLE;

diff --git a/src/manager_core.c b/src/manager_core.c
index a0c8470..53201ec 100644 (file)
--- a/src/manager_core.c
+++ b/src/manager_core.c
@@ -82,6 +82,11 @@ void manager_core_create_modem_board(TcorePlugin *manager_plugin, TcorePlugin *m
 
        /* Create Modem Board */
        mb = g_try_malloc0(sizeof(ModemBoard));
+       if(mb == NULL) {
+               err("Memory alloc failed");
+               return;
+       }
+
        mb->index = index;
        mb->modem_plugin = modem_plugin;
        mb->fdn_enabled = FALSE;
@@ -219,6 +224,9 @@ gboolean manager_core_init(TcorePlugin *plugin)
 
        /* Private data for Manager plug-in */
        priv_data = g_malloc0(sizeof(PrivateData));
+       if (!priv_data)
+               goto ERROR;
+
        /* Link private data to plug-in */
        tcore_plugin_link_user_data(plugin, priv_data);
 

diff --git a/src/manager_network.c b/src/manager_network.c
index 13dcf55..d445f36 100644 (file)
--- a/src/manager_network.c
+++ b/src/manager_network.c
@@ -507,6 +507,10 @@ gboolean manager_network_initialize_private_info(ModemBoard *mb)
                manager_network_clear_private_info(mb);
 
        mb->network_info = g_try_malloc0(sizeof(struct manager_network_private_info));
+       if(mb->network_info == NULL) {
+               err("Memory alloc failed");
+               return FALSE;
+       }
 
        npi = mb->network_info;
        npi->co_network = tcore_plugin_ref_core_object(mb->modem_plugin, CORE_OBJECT_TYPE_NETWORK);

diff --git a/src/manager_sim.c b/src/manager_sim.c
index 44da662..5bff065 100644 (file)
--- a/src/manager_sim.c
+++ b/src/manager_sim.c
@@ -984,6 +984,10 @@ gboolean manager_sim_initialize_private_info(ModemBoard *mb)
                mb->sim_info->sim_status = SIM_STATUS_UNKNOWN;
 
        mb->sim_info = g_try_malloc0(sizeof(struct manager_sim_private_info));
+       if(mb->sim_info == NULL) {
+               err("Memory alloc failed");
+               return FALSE;
+       }
        mb->sim_info->co_sim = tcore_plugin_ref_core_object(mb->modem_plugin, CORE_OBJECT_TYPE_SIM);
        mb->sim_info->sim_status = SIM_STATUS_UNKNOWN;
        mb->sim_info->is_first_boot = TRUE;

diff --git a/src/network_name/manager_network_name.c b/src/network_name/manager_network_name.c
index 1b2e61a..3c17bb3 100644 (file)
--- a/src/network_name/manager_network_name.c
+++ b/src/network_name/manager_network_name.c
@@ -659,7 +659,7 @@ static void __network_get_exceptional_name_from_plmn(NetworkPrivateInfo *npi, ch
                if (spn && strlen((char *)spn->spn) > 0) {
                        dbg("CSL Network, SPN(%s) sholud be displayed instead of PLMN(%s)", spn->spn, name);
                        memset(name, 0, NETWORK_MAX_NETWORK_NAME_LEN + 1);
-                       memcpy(name, spn->spn, strlen((const char *)spn->spn));
+                       snprintf(name, strlen((const char *)spn->spn) + 1, "%s", spn->spn);
                } else
                        warn("Cannot get spn");
                g_free(spn);
@@ -668,7 +668,7 @@ static void __network_get_exceptional_name_from_plmn(NetworkPrivateInfo *npi, ch
                /* check for roaming status if in roaming set name to Vodafone AU R */
                dbg("Vodafone AU R updated due to operator request ");
                memset(name, 0, NETWORK_MAX_NETWORK_NAME_LEN + 1);
-               memcpy(name, "Vodafone AU R", strlen("Vodafone AU R"));
+               snprintf(name, strlen("Vodafone AU R") + 1, "Vodafone AU R");
        }
 }