Fix svace issue (311582, 311586, 312223)

Change-Id: I2d94c8bac6c8a9d39ab683c3c13a61ff9f9cf319

diff --git a/packaging/libtcore.spec b/packaging/libtcore.spec
index 7f8209b..7171d67 100644 (file)
--- a/packaging/libtcore.spec
+++ b/packaging/libtcore.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 19
+%define patchlevel 20
 
 Name:           libtcore
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/core_object/co_sat.c b/src/core_object/co_sat.c
index 7ac0a3a..13ef45c 100644 (file)
--- a/src/core_object/co_sat.c
+++ b/src/core_object/co_sat.c
@@ -98,13 +98,13 @@
 #define SATK_REMOTE_ENTITY_ADDRESS_TAG         0x49 /* REMOTE ENTITY ADDRESS TAG */
 #define SATK_TEXT_ATTRIBUTE_TAG                        0x50 /* TEXT ATTRIBUTE TAG */
 #define SATK_TEXT_ATTRIBUTE_LIST_TAG                   0x51 /* TEXT ATTRIBUTE LIST TAG */
-#define SATK_IMEISV_TAG                                0x62 /* IMEISV TAG */
-#define SATK_BATTERY_STATE_TAG                         0x63 /* BATTERY STATE TAG */
-#define SATK_BROWSING_STATUS_TAG               0x64 /* BROWSING STATUS TAG */
-#define SATK_NETWORK_SEARCH_MODE_TAG   0x65 /* NETWORK SEARCH MODE TAG */
-#define SATK_FRAME_LAYOUT_TAG                  0x66 /* FRAME LAYOUT TAG */
-#define SATK_FRAME_INFORMATION_TAG             0x67 /* FRAME INFORMATION TAG */
-#define SATK_FRAME_IDENTIFIER_TAG              0x68 /* FRAME IDENTIFIER TAG */
+#define SATK_IMEISV_TAG                                        0x62 /* IMEISV TAG */
+#define SATK_BATTERY_STATE_TAG                 0x63 /* BATTERY STATE TAG */
+#define SATK_BROWSING_STATUS_TAG               0x64 /* BROWSING STATUS TAG */
+#define SATK_NETWORK_SEARCH_MODE_TAG   0x65 /* NETWORK SEARCH MODE TAG */
+#define SATK_FRAME_LAYOUT_TAG                  0x66 /* FRAME LAYOUT TAG */
+#define SATK_FRAME_INFORMATION_TAG             0x67 /* FRAME INFORMATION TAG */
+#define SATK_FRAME_IDENTIFIER_TAG              0x68 /* FRAME IDENTIFIER TAG */
 
 /* general data object lengths */
 #define SATK_DCS_LENGTH                                0x01
@@ -1401,7 +1401,7 @@ static enum tcore_sat_result _sat_decode_file_list_tlv(unsigned char *tlv_str, i
        temp_index++;
        tmp_cnt = src_data[temp_index++];
        file_list_obj->file_count = 0;
-       memset(file_list_obj->file_id, 0, SAT_FILE_ID_LIST_MAX_COUNT);
+       memset(file_list_obj->file_id, 0, sizeof(enum tel_sim_file_id)*SAT_FILE_ID_LIST_MAX_COUNT);
 
        if (!tmp_cnt) {
                dbg("file cnt = 0");
@@ -1583,7 +1583,7 @@ static enum tcore_sat_result _sat_decode_event_list_tlv(unsigned char *tlv_str,
        }
 
        event_list_obj->event_list_cnt = 0;
-       memset(event_list_obj->evt_list, 0xFF, SAT_EVENT_LIST_MAX);
+       memset(event_list_obj->evt_list, 0xFF, sizeof(enum event_list)*SAT_EVENT_LIST_MAX);
 
        /* event list */
        for (i = 0; i < evt_list_len; i++) {
@@ -3369,7 +3369,7 @@ static enum tcore_sat_result _sat_decode_refresh(unsigned char *o_cmd_data, int
                rv = _sat_decode_application_identifier_tlv(o_cmd_data, o_length, temp_index, &sat_cmd_ind_data->data.refresh.aid, &data_len_consumed);
                if (rv != TCORE_SAT_SUCCESS)
                        return rv;
-               temp_index+=data_len_consumed;
+               temp_index += data_len_consumed;
                if (temp_index >= o_length) {
                        dbg("[SAT] SAT PARSER - no more TLVs to decode.");
                        return TCORE_SAT_SUCCESS;
@@ -3382,7 +3382,7 @@ static enum tcore_sat_result _sat_decode_refresh(unsigned char *o_cmd_data, int
                rv = _sat_decode_alpha_identifier_tlv(o_cmd_data, o_length, temp_index, &sat_cmd_ind_data->data.refresh.alpha_id, &data_len_consumed);
                if (rv != TCORE_SAT_SUCCESS)
                        return rv;
-               temp_index+=data_len_consumed;
+               temp_index += data_len_consumed;
                if (temp_index >= o_length) {
                        dbg("[SAT] SAT PARSER - no more TLVs to decode.");
                        return TCORE_SAT_SUCCESS;
@@ -3395,7 +3395,7 @@ static enum tcore_sat_result _sat_decode_refresh(unsigned char *o_cmd_data, int
                rv = _sat_decode_icon_identifier_tlv(o_cmd_data, o_length, temp_index, &sat_cmd_ind_data->data.refresh.icon_id, &data_len_consumed);
                if (rv != TCORE_SAT_SUCCESS)
                        return rv;
-               temp_index+=data_len_consumed;
+               temp_index += data_len_consumed;
                if (temp_index >= o_length) {
                        dbg("[SAT] SAT PARSER - no more TLVs to decode.");
                        return TCORE_SAT_SUCCESS;
@@ -3408,7 +3408,7 @@ static enum tcore_sat_result _sat_decode_refresh(unsigned char *o_cmd_data, int
                rv = _sat_decode_text_attribute_tlv(o_cmd_data, o_length, temp_index, &sat_cmd_ind_data->data.refresh.text_attribute, &data_len_consumed);
                if (rv != TCORE_SAT_SUCCESS)
                        return rv;
-               temp_index+=data_len_consumed;
+               temp_index += data_len_consumed;
                if (temp_index >= o_length) {
                        dbg("[SAT] SAT PARSER - no more TLVs to decode.");
                        return TCORE_SAT_SUCCESS;
@@ -3421,7 +3421,7 @@ static enum tcore_sat_result _sat_decode_refresh(unsigned char *o_cmd_data, int
                rv = _sat_decode_frame_identifier_tlv(o_cmd_data, o_length, temp_index, &sat_cmd_ind_data->data.refresh.frame_id, &data_len_consumed);
                if (rv != TCORE_SAT_SUCCESS)
                        return rv;
-               temp_index+=data_len_consumed;
+               temp_index += data_len_consumed;
        }
        dbg("[SAT] SAT PARSER - :decoding done!.");
        return TCORE_SAT_SUCCESS;
@@ -6479,7 +6479,7 @@ static int _sat_encode_download_event(const struct tel_sat_envelop_event_downloa
 
        dbg("event type(%d)", evt_dl->event);
 
-       if(evt_dl->event ==  EVENT_SMS_PP_DATA_DOWNLOAD){
+       if (evt_dl->event == EVENT_SMS_PP_DATA_DOWNLOAD) {
                encoded_len = _sat_encode_sms_pp_data_tlv(&(evt_dl->sms_pp), dst_envelop, 0);
                temp_index += encoded_len;
                dbg("temp_index(%d)", temp_index);
@@ -6525,6 +6525,9 @@ static int _sat_encode_download_event(const struct tel_sat_envelop_event_downloa
 
                dbg("download envelop cmd len(%d)", temp_index);
 
+/* Remove unreachable code */
+/* temp_index is assigned from 9 upto 16 */
+#if 0
                if (temp_index-2 > 0x7F) {
                        int idx = 0;
                        for (idx = temp_index; idx > 0; idx--)
@@ -6533,6 +6536,7 @@ static int _sat_encode_download_event(const struct tel_sat_envelop_event_downloa
                        temp_index += 1;
                        dbg("download envelop added cmd len(%d)", temp_index);
                }
+#endif
        }
 
        return temp_index;