aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuta Doi <yuta-d@witz-inc.co.jp>2018-06-19 18:33:31 +0900
committerYuta Doi <yuta-d@witz-inc.co.jp>2018-06-19 18:33:31 +0900
commitb0063351853db6c861f035ee9a147a0a7f5b58e1 (patch)
tree5187a1c1632f6a2d3f7c7330910355e3b5859c0c
parentc06c6004c9a9ca6d0e5a45461bfd3730b584422c (diff)
Bug fix: nullptr access
Change-Id: Idb64e91729c566dfb006bb71c82cf695e68945d2 Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
-rw-r--r--src/policy_manager/policy_manager.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/policy_manager/policy_manager.cpp b/src/policy_manager/policy_manager.cpp
index bc3fd8d..cc7cd75 100644
--- a/src/policy_manager/policy_manager.cpp
+++ b/src/policy_manager/policy_manager.cpp
@@ -579,11 +579,11 @@ static int checkPolicy(sd_event_source *source, void *data) {
if (crr_state.car.is_changed) {
if (stm::gStmCarStateNoRun == crr_state.car.state) {
// Set delay event(restriction mode on)
- checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_ON, 3000, nullptr);
+ checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_ON, 3000, "");
}
else if (stm::gStmCarStateNoStop == crr_state.car.state) {
// Set event(restriction mode off)
- checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_OFF, 0, nullptr);
+ checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_OFF, 0, "");
// Stop timer for restriction on event
if (pm::event_source_list.find(STM_EVT_NO_RESTRICTION_MODE_ON)
@@ -730,7 +730,6 @@ int PolicyManager::setInputEventData(json_object* json_in) {
else {
event_info.role = std::string(role);
}
- event_info.role = std::string(role);
event_info.delay = 0;
pm::g_event_info_queue.push(event_info);