Fix undefined behaviour in several cases

3 files changed, 20 insertions, 15 deletions

diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 7bee58fd42..b6193b018e 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -4051,7 +4051,10 @@ struct TakeDeviceHandle {
 ApplicationSharedPtr ApplicationManagerImpl::application(
     const std::string& device_id, const std::string& policy_app_id) const {
   connection_handler::DeviceHandle device_handle;
-  connection_handler().GetDeviceID(device_id, &device_handle);
+  if (!connection_handler().GetDeviceID(device_id, &device_handle)) {
+    LOG4CXX_DEBUG(logger_, "No such device : " << device_id);
+    return ApplicationSharedPtr();
+  }
 
   DataAccessor<ApplicationSet> accessor = applications();
   ApplicationSharedPtr app =
diff --git a/src/components/remote_control/src/commands/set_interior_vehicle_data_request.cc b/src/components/remote_control/src/commands/set_interior_vehicle_data_request.cc
index d88e522ac1..70fbd9280e 100644
--- a/src/components/remote_control/src/commands/set_interior_vehicle_data_request.cc
+++ b/src/components/remote_control/src/commands/set_interior_vehicle_data_request.cc
@@ -332,16 +332,16 @@ std::vector<std::string> SetInteriorVehicleDataRequest::ControlData(
     const Json::Value& message) {
   Json::Value data =
       message.get(message_params::kModuleData, Json::Value(Json::objectValue));
-  const char* name_control_data;
   std::string module = ModuleType(message);
+  Json::Value params;
   if (module == enums_value::kRadio) {
-    name_control_data = message_params::kRadioControlData;
+    params = data.get(message_params::kRadioControlData,
+                      Json::Value(Json::objectValue));
   }
   if (module == enums_value::kClimate) {
-    name_control_data = message_params::kClimateControlData;
+    params = data.get(message_params::kClimateControlData,
+                      Json::Value(Json::objectValue));
   }
-  Json::Value params =
-      data.get(name_control_data, Json::Value(Json::objectValue));
   return params.getMemberNames();
 }
 
diff --git a/src/components/remote_control/src/resource_allocation_manager_impl.cc b/src/components/remote_control/src/resource_allocation_manager_impl.cc
index ba77b75600..fd6c2d8fb8 100644
--- a/src/components/remote_control/src/resource_allocation_manager_impl.cc
+++ b/src/components/remote_control/src/resource_allocation_manager_impl.cc
@@ -226,15 +226,17 @@ void ResourceAllocationManagerImpl::SetResourceState(
     const AllocatedResources::const_iterator allocated_it =
         allocated_resources_.find(module_type);
 
-    const std::string status = allocated_resources_.end() != allocated_it
-                                   ? " acquired "
-                                   : " not acquired ";
-    UNUSED(status);
-    LOG4CXX_DEBUG(logger_,
-                  "Resource " << module_type << " is " << status
-                              << " Owner application id is "
-                              << allocated_it->second
-                              << " Changing application id is " << app_id);
+    const bool acquired = allocated_resources_.end() != allocated_it;
+    if (acquired) {
+      LOG4CXX_DEBUG(logger_,
+                    "Resource " << module_type << " is already acquired."
+                                << " Owner application id is "
+                                << allocated_it->second
+                                << " Changing application id is " << app_id);
+    } else {
+      LOG4CXX_DEBUG(logger_,
+                    "Resource " << module_type << " is not acquired yet");
+    }
   }
 
   sync_primitives::AutoLock lock(resources_state_lock_);