Remove some vulnerable functions

Remove unreachable code
Fix memory leak issue

Change-Id: Iadef2d10a4a083fa6f91802282c7f9482876ec7a

diff --git a/packaging/tel-plugin-manager.spec b/packaging/tel-plugin-manager.spec
index 16d7705a711afdc633722313c5708027e15acf66..500b6d433f6d60ff9771581e629bdd5cbaa548c0 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 4
+%define patchlevel 5
 
 Name:           tel-plugin-manager
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/manager_modem.c b/src/manager_modem.c
index 469dcf77b67a0949b911a8059f53c9927c8e024c..bc639729cf57a5f3118b72931bd4eba0bf07227f 100644 (file)
--- a/src/manager_modem.c
+++ b/src/manager_modem.c
@@ -233,11 +233,6 @@ enum tcore_manager_return manager_modem_process_notification(Manager *manager,
        case TNOTI_MODEM_POWER: {
                const struct tnoti_modem_power *modem_power = data;
 
-               if (modem_power == NULL) {
-                       err("modem_power data is NULL");
-                       return ret;
-               }
-
                switch (modem_power->state) {
                case MODEM_STATE_ERROR:
                        dbg("Modem RESET happened");

diff --git a/src/manager_network.c b/src/manager_network.c
index 267110d026fee3ed768ee60e81cf93bc987f28f0..13dcf5551e99357aed4169b4b58cc9bbbbf85190 100644 (file)
--- a/src/manager_network.c
+++ b/src/manager_network.c
@@ -554,10 +554,12 @@ void manager_network_clear_private_info(ModemBoard *mb)
 
        if (npi->eons_data) {
                g_free(npi->eons_data->spdi);
-               if (npi->eons_data->opl->list)
+               if (npi->eons_data->opl && npi->eons_data->opl->list)
                        g_free(npi->eons_data->opl->list);
-               if (npi->eons_data->pnn->list)
+               g_free(npi->eons_data->opl);
+               if (npi->eons_data->pnn && npi->eons_data->pnn->list)
                        g_free(npi->eons_data->pnn->list);
+               g_free(npi->eons_data->pnn);
                if (npi->eons_data->spn_override_info) {
                        g_free(npi->eons_data->spn_override_info->spn);
                        g_free(npi->eons_data->spn_override_info->imsi_subset);

diff --git a/src/manager_sms.c b/src/manager_sms.c
index 5f1cd6a0996ccd6ccf5af4b6fc9f3e7faa820127..27d94c8a6d6375ad9e9f494307ee23a270e960ca 100644 (file)
--- a/src/manager_sms.c
+++ b/src/manager_sms.c
@@ -90,35 +90,6 @@ static Sms_class_type __sms_util_decode_dcs(unsigned char dcs)
                        case 0x03:
                                return SMS_CLASS_3;
                                break;
-
-                       default:
-                               return SMS_CLASS_NONE;
-                               break;
-                       }
-               } else
-                       return SMS_CLASS_NONE;
-       } else if (dcs >= 0x40 && dcs < 0x80) {
-               if (dcs & 0x10) {
-                       switch (dcs & 0x03) {
-                       case 0x00:
-                               return SMS_CLASS_0;
-                               break;
-
-                       case 0x01:
-                               return SMS_CLASS_1;
-                               break;
-
-                       case 0x02:
-                               return SMS_CLASS_2;
-                               break;
-
-                       case 0x03:
-                               return SMS_CLASS_3;
-                               break;
-
-                       default:
-                               return SMS_CLASS_NONE;
-                               break;
                        }
                } else
                        return SMS_CLASS_NONE;
@@ -145,10 +116,6 @@ static Sms_class_type __sms_util_decode_dcs(unsigned char dcs)
                case 0x03:
                        return SMS_CLASS_3;
                        break;
-
-               default:
-                       return SMS_CLASS_NONE;
-                       break;
                }
        }
        return SMS_CLASS_NONE;

diff --git a/src/network_name/manager_network_name.c b/src/network_name/manager_network_name.c
index d6ec595f0165398ac8d39d71e38face2d249dcdf..1b2e61a9fee8cc14a945cc2550fad9ae17ec0f11 100644 (file)
--- a/src/network_name/manager_network_name.c
+++ b/src/network_name/manager_network_name.c
@@ -747,12 +747,10 @@ static char *__network_get_eons_name(NetworkPrivateInfo *npi, const char *plmn,
        /* if NA PLMN & the length is 5 then add '0' at 6th digit of PLMN*/
        if (strlen(network_plmn) == 5) {
                if (tcore_util_is_country_NA(network_plmn) == TRUE) {
-                       char buf[7] = { 0, };
-                       strcpy(buf, network_plmn);
-                       strcat(buf, "0");
+                       char buf[7] = {0, };
+                       snprintf(buf, 7, "%s0", network_plmn);
                        g_free(network_plmn);
                        network_plmn = g_strdup(buf);
-
                        is_na_plmn = TRUE;
                }
        }