From 7b418e42988852d504b03647d81e6c2bdc3a58d9 Mon Sep 17 00:00:00 2001 From: Wootak Jung Date: Wed, 20 Apr 2016 18:20:03 +0900 Subject: [PATCH] Fix NULL handle issue for each module - TSAM-2324 Change-Id: I1153ae438c828b8e70c8de7d405350c7ca161e41 --- module/src/callmgr-sensor.c | 2 ++ packaging/call-manager.spec | 2 +- service/src/callmgr-core.c | 9 ++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/module/src/callmgr-sensor.c b/module/src/callmgr-sensor.c index e187cd8..2b3cdc4 100755 --- a/module/src/callmgr-sensor.c +++ b/module/src/callmgr-sensor.c @@ -85,6 +85,7 @@ static void __callmgr_sensor_face_down_cb(gesture_type_e gesture, const gesture_ int _callmgr_sensor_face_down_start(callmgr_sensor_handle_h sensor_handle) { dbg(">>"); + CM_RETURN_VAL_IF_FAIL(sensor_handle, -1); int ret = -1; bool is_supported = true; @@ -145,6 +146,7 @@ int _callmgr_sensor_face_down_start(callmgr_sensor_handle_h sensor_handle) int _callmgr_sensor_face_down_stop(callmgr_sensor_handle_h sensor_handle) { dbg(">>"); + CM_RETURN_VAL_IF_FAIL(sensor_handle, -1); if (sensor_handle->gesture_handle == NULL) { warn("No handle"); diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec index 3ae909e..8b8db70 100755 --- a/packaging/call-manager.spec +++ b/packaging/call-manager.spec @@ -1,6 +1,6 @@ %define major 0 %define minor 1 -%define patchlevel 58 +%define patchlevel 59 %define ext_feature 0 Name: call-manager diff --git a/service/src/callmgr-core.c b/service/src/callmgr-core.c index 064ad1a..9b20c68 100644 --- a/service/src/callmgr-core.c +++ b/service/src/callmgr-core.c @@ -2077,13 +2077,16 @@ int _callmgr_core_init(callmgr_core_data_t **o_core_data) CM_RETURN_VAL_IF_FAIL(core_data->ringer_handle, -1); _callmgr_bt_init(&core_data->bt_handle, __callmgr_core_process_bt_events, core_data); - CM_RETURN_VAL_IF_FAIL(core_data->bt_handle, -1); + if (!core_data->bt_handle) + err("core_data->bt_handle is NULL"); _callmgr_sensor_init(&core_data->sensor_handle, __callmgr_core_process_sensor_events, core_data); - CM_RETURN_VAL_IF_FAIL(core_data->sensor_handle, -1); + if (!core_data->sensor_handle) + err("core_data->sensor_handle is NULL"); _callmgr_vr_init(&core_data->vr_handle, __callmgr_core_process_vr_events, core_data); - CM_RETURN_VAL_IF_FAIL(core_data->vr_handle, -1); + if (!core_data->vr_handle) + err("core_data->vr_handle is NULL"); *o_core_data = core_data; -- 2.7.4