diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-05 11:01:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 11:01:09 -0700 |
| commit | 92d03d64236864a191c5e8ab9fa3c1c35111a486 (patch) | |
| tree | 7785dfd05ad52055041e18aa1770f3de57fa8da8 | |
| parent | ba1da7bc2ff3fd37638620f6bea526384646ab0e (diff) | |
| parent | 2e2853052bbb2446bba7f3f742b997e80cfe69a9 (diff) | |
| download | sdl_core-92d03d64236864a191c5e8ab9fa3c1c35111a486.tar.gz | |
Merge pull request #2327 from XevoInc/bugfix/travis_cppcheck
Bugfix/travis cppcheck
3 files changed, 8 insertions, 7 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc index bb621f814c..83edb76264 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc @@ -639,11 +639,12 @@ CommandCreator& HMICommandFactory::get_creator_factory( } case hmi_apis::FunctionID::VehicleInfo_GetFuelLevelState: { return hmi_apis::messageType::request == message_type - ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate< - hmi_apis::FunctionID::VehicleInfo_GetFuelLevelState> >(); - : factory.GetCreator< - commands::VIGetVehicleDataResponseTemplate<hmi_apis:: - FunctionID::VehicleInfo_GetFuelLevelState>> () + ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetFuelLevelState> >() + : factory + .GetCreator<commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID:: + VehicleInfo_GetFuelLevelState> >(); } case hmi_apis::FunctionID::VehicleInfo_GetInstantFuelConsumption: { return hmi_apis::messageType::request == message_type diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/activate_app_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/activate_app_request_test.cc index dcbd21dbe0..8cb5e97891 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/activate_app_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/activate_app_request_test.cc @@ -105,8 +105,7 @@ TEST_F(ActivateAppRequestTest, Run_SUCCESS) { EXPECT_CALL(mock_rpc_service_, SendMessageToHMI(CheckMessage(mobile_apis::HMILevel::HMI_FULL))); #else - EXPECT_CALL(mock_rpc_service_, - SendMessageToHMI(msg))); + EXPECT_CALL(mock_rpc_service_, SendMessageToHMI(msg)); #endif command->Run(); diff --git a/src/components/application_manager/src/mobile_message_handler.cc b/src/components/application_manager/src/mobile_message_handler.cc index 2f06c5f3b5..8e64bc952b 100644 --- a/src/components/application_manager/src/mobile_message_handler.cc +++ b/src/components/application_manager/src/mobile_message_handler.cc @@ -143,6 +143,7 @@ MobileMessageHandler::HandleIncomingMessageProtocolV1( message->service_type())); if (!message) { NOTREACHED(); + delete outgoing_message; return NULL; } |