Fix svace issue (251425,251426,251427,251428)

Change-Id: If4ead5ed1b7c48294b042f6d48683a6763e5f615

diff --git a/packaging/tel-plugin-manager.spec b/packaging/tel-plugin-manager.spec
index fdc498561872dbb924d46a7952dc8f144aeb71a3..3db93bdf9b24413ba6cec8bee4b27b0018cbf7f1 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 12
+%define patchlevel 13
 
 Name:           tel-plugin-manager
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/manager_sim.c b/src/manager_sim.c
index 5bff065b712cb6fccaa1babcb1416f381b2fe855..350aafc55bc8f7f2310e05bd3e93a7246af7ae6a 100644 (file)
--- a/src/manager_sim.c
+++ b/src/manager_sim.c
@@ -299,11 +299,16 @@ static gboolean __are_both_sims_ready_after_boot(Manager *manager)
                return FALSE;
 
        for (list = priv_data->board_list; list; list = list->next) {
-               int sim_index = -1;
+               ModemBoardIndex sim_index = MANAGER_MODEM_BOARD_INDEX_INVALID;
                ModemBoard *mb = list->data;
+
                if (G_UNLIKELY(!mb))
                        continue;
+
                sim_index = manager_core_get_modem_board_index(tcore_object_ref_plugin(mb->sim_info->co_sim));
+               if (sim_index == MANAGER_MODEM_BOARD_INDEX_INVALID)
+                       continue;
+
                sim_status[sim_index] = mb->sim_info->sim_status;
                modem_status[sim_index] = mb->modem_info->modem_status;
        }
@@ -984,7 +989,7 @@ 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) {
+       if (mb->sim_info == NULL) {
                err("Memory alloc failed");
                return FALSE;
        }
@@ -1018,7 +1023,7 @@ void manager_network_resp_hook_set_dds(UserRequest *ur,
                                       unsigned int data_len, const void *data, void *user_data)
 {
        TcorePlugin *modem_plugin = (TcorePlugin *)user_data;
-       int subs_id = manager_core_get_modem_board_index(modem_plugin);
+       ModemBoardIndex subs_id = manager_core_get_modem_board_index(modem_plugin);
        struct tresp_network_set_default_data_subscription *resp = (struct tresp_network_set_default_data_subscription *)data;
 
        if (resp->result == TCORE_RETURN_SUCCESS) {
@@ -1122,7 +1127,7 @@ static void __network_mode_set_on_boot(Manager *manager)
        int nw_mode[2] = { -2, -2}; // Initialised to -2 i.e SIM's are not present
        ModemBoard *mb = NULL;
        Server *s = tcore_plugin_ref_server(tcore_manager_get_plugin(manager));
-       enum telephony_subscription_type sim_index = TELEPHONY_SUBSCRIPTION_TYPE_DEFAULT;
+       ModemBoardIndex sim_index = MANAGER_MODEM_BOARD_INDEX_INVALID;
 
        info("Both SIM status received, process network mode...");
        modems = tcore_server_get_modem_plugin_list(s);
@@ -1134,6 +1139,9 @@ static void __network_mode_set_on_boot(Manager *manager)
                        continue;
                }
                sim_index = manager_core_get_modem_board_index(modem_plugin);
+               if (sim_index == MANAGER_MODEM_BOARD_INDEX_INVALID)
+                       continue;
+
                mb = manager_core_get_modem_board(manager, modem_plugin);
 
                if (mb->sim_info->sim_status == SIM_STATUS_INIT_COMPLETED) {
@@ -1186,6 +1194,9 @@ static void __network_mode_set_on_boot(Manager *manager)
                        continue;
                }
                sim_index = manager_core_get_modem_board_index(modem_plugin);
+               if (sim_index == MANAGER_MODEM_BOARD_INDEX_INVALID)
+                       continue;
+
                mb = manager_core_get_modem_board(manager, modem_plugin);
 
                if (mb->sim_info->sim_status == SIM_STATUS_INIT_COMPLETED) {
@@ -1204,7 +1215,7 @@ static void __dds_set_on_boot(Manager *manager)
        int dds_rank[TELEPHONY_SUBSCRIPTION_TYPE_MAX] = { -1, -1 };
        ModemBoard *mb = NULL;
        Server *s = tcore_plugin_ref_server(tcore_manager_get_plugin(manager));
-       enum telephony_subscription_type sim_index = TELEPHONY_SUBSCRIPTION_TYPE_DEFAULT;
+       ModemBoardIndex sim_index = MANAGER_MODEM_BOARD_INDEX_INVALID;
        TcorePlugin *modem_plugins[TELEPHONY_SUBSCRIPTION_TYPE_MAX] = {};
        int subs_id = TELEPHONY_SUBSCRIPTION_TYPE_DEFAULT;
 
@@ -1218,6 +1229,9 @@ static void __dds_set_on_boot(Manager *manager)
                        continue;
                }
                sim_index = manager_core_get_modem_board_index(modem_plugin);
+               if (sim_index == MANAGER_MODEM_BOARD_INDEX_INVALID)
+                       continue;
+
                mb = manager_core_get_modem_board(manager, modem_plugin);
 
                if (mb->sim_info->sim_status == SIM_STATUS_INIT_COMPLETED)
@@ -1267,7 +1281,7 @@ static void __ds_set_on_boot(Manager *manager)
        int ds_rank[TELEPHONY_SUBSCRIPTION_TYPE_MAX] = { -1, -1 };
        ModemBoard *mb = NULL;
        Server *s = tcore_plugin_ref_server(tcore_manager_get_plugin(manager));
-       enum telephony_subscription_type sim_index = TELEPHONY_SUBSCRIPTION_TYPE_DEFAULT;
+       ModemBoardIndex sim_index = MANAGER_MODEM_BOARD_INDEX_INVALID;
        char *always_ask_hash = NULL;
        int always_ask_ds_rank = 0;
        enum telephony_call_preferred_voice_subs preferred_subs = CALL_PREFERRED_VOICE_SUBS_SIM1;
@@ -1288,6 +1302,9 @@ static void __ds_set_on_boot(Manager *manager)
                        continue;
                }
                sim_index = manager_core_get_modem_board_index(modem_plugin);
+               if (sim_index == MANAGER_MODEM_BOARD_INDEX_INVALID)
+                       continue;
+
                mb = manager_core_get_modem_board(manager, modem_plugin);
 
                if (mb->sim_info->sim_status == SIM_STATUS_INIT_COMPLETED)