Fix svace issue on Common Artik

Change-Id: If0b64aac9a23b39fe10f45204e55f8bcb576ddd7

diff --git a/module/src/callmgr-telephony.c b/module/src/callmgr-telephony.c
index 79fd68897c3f6151c12c00cc2dbeb29d3a8e559f..2c50c5abcf76f280c05f2cfed9a20c8bf263f0da 100644 (file)
--- a/module/src/callmgr-telephony.c
+++ b/module/src/callmgr-telephony.c
@@ -2934,7 +2934,7 @@ int _callmgr_telephony_has_call_by_state(callmgr_telephony_t telephony_handle, c
        list_len = g_slist_length(call_list);
        for (idx = 0; idx < list_len; idx++) {
                call = g_slist_nth_data(call_list, idx);
-               if (call->call_state == state) {
+               if ((call) && (call->call_state == state)) {
                        b_found_call = TRUE;
                }
        }
@@ -2955,7 +2955,7 @@ int _callmgr_telephony_get_call_by_state(callmgr_telephony_t telephony_handle, c
        list_len = g_slist_length(modem_info->call_list);
        for (idx = 0; idx < list_len; idx++) {
                call = g_slist_nth_data(modem_info->call_list, idx);
-               if (call->call_state == state) {
+               if ((call) && (call->call_state == state)) {
                        *call_data_out = call;
                        return 0;
                }
@@ -2975,7 +2975,7 @@ static int __callmgr_telephony_end_all_call_by_state(callmgr_telephony_t telepho
        list_len = g_slist_length(modem_info->call_list);
        for (idx = 0; idx < list_len; idx++) {
                call = g_slist_nth_data(modem_info->call_list, idx);
-               if (call->call_state == state) {
+               if ((call) && (call->call_state == state)) {
                        _callmgr_telephony_end_call(telephony_handle, call->call_id, CM_TEL_CALL_RELEASE_TYPE_BY_CALL_HANDLE);
                }
        }
@@ -2996,7 +2996,7 @@ static int __callmgr_telephony_get_call_to_be_retrieved(callmgr_telephony_t tele
        list_len = g_slist_length(modem_info->call_list);
        for (idx = 0; idx < list_len; idx++) {
                call = g_slist_nth_data(modem_info->call_list, idx);
-               if (call->retrieve_flag == TRUE) {
+               if ((call) && (call->retrieve_flag == TRUE)) {
                        *call_data_out = call;
                        return 0;
                }
@@ -3017,7 +3017,7 @@ int _callmgr_telephony_get_video_call(callmgr_telephony_t telephony_handle, cm_t
        list_len = g_slist_length(call_list);
        for (idx = 0; idx < list_len; idx++) {
                call = g_slist_nth_data(call_list, idx);
-               if (call->call_type == CM_TEL_CALL_TYPE_CS_VIDEO || call->call_type == CM_TEL_CALL_TYPE_PS_VIDEO) {
+               if ((call) && (call->call_type == CM_TEL_CALL_TYPE_CS_VIDEO || call->call_type == CM_TEL_CALL_TYPE_PS_VIDEO)) {
                        info("Video Call found. [%d]", call->call_id);
                        *call_data_out = call;
                        return 0;
@@ -3039,7 +3039,7 @@ int _callmgr_telephony_get_voice_call(callmgr_telephony_t telephony_handle, cm_t
        list_len = g_slist_length(call_list);
        for (idx = 0; idx < list_len; idx++) {
                call = g_slist_nth_data(call_list, idx);
-               if (call->call_type == CM_TEL_CALL_TYPE_CS_VOICE || call->call_type == CM_TEL_CALL_TYPE_PS_VOICE || call->call_type == CM_TEL_CALL_TYPE_E911) {
+               if ((call) && (call->call_type == CM_TEL_CALL_TYPE_CS_VOICE || call->call_type == CM_TEL_CALL_TYPE_PS_VOICE || call->call_type == CM_TEL_CALL_TYPE_E911)) {
                        info("Voice Call found. [%d]", call->call_id);
                        *call_data_out = call;
                        return 0;
@@ -3121,7 +3121,7 @@ int _callmgr_telephony_get_sat_originated_call(callmgr_telephony_t telephony_han
        list_len = g_slist_length(call_list);
        for (idx = 0; idx < list_len; idx++) {
                call = g_slist_nth_data(call_list, idx);
-               if (call->is_sat_originated_call) {
+               if ((call) && (call->is_sat_originated_call)) {
                        info("Call found. id[%d], name[%s], number[%s]", call->call_id, call->calling_name, call->call_number);
                        *call_data_out = call;
                        return 0;
@@ -3143,7 +3143,7 @@ int _callmgr_telephony_get_sat_call_control_call(callmgr_telephony_t telephony_h
        list_len = g_slist_length(call_list);
        for (idx = 0; idx < list_len; idx++) {
                call = g_slist_nth_data(call_list, idx);
-               if (call->is_in_sat_call_control) {
+               if ((call) && (call->is_in_sat_call_control)) {
                        info("Call found. id[%d], name[%s], number[%s]", call->call_id, call->calling_name, call->call_number);
                        *call_data_out = call;
                        return 0;
@@ -3172,11 +3172,7 @@ int _callmgr_telephony_get_call_by_call_id(callmgr_telephony_t telephony_handle,
        list_len = g_slist_length(call_list);
        for (idx = 0; idx < list_len; idx++) {
                call = g_slist_nth_data(call_list, idx);
-               if (call == NULL) {
-                       err("%dth call data is NULL", idx);
-                       return -1;
-               }
-               if (call->call_id == call_id) {
+               if ((call) && (call->call_id == call_id)) {
                        info("Call found[%d]", call->call_id);
                        *call_data_out = call;
                        return 0;

diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec
index 682657f242a6ffc2d142862a20a74267bc77361e..4d95e2e3279ebac98f8ec49235256ff8a7c5fa8b 100644 (file)
--- a/packaging/call-manager.spec
+++ b/packaging/call-manager.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 97
+%define patchlevel 98
 %define ext_feature 0
 
 Name:           call-manager