Coverity Fixes

3 files changed, 13 insertions, 6 deletions

diff --git a/src/components/application_manager/include/application_manager/commands/mobile/perform_audio_pass_thru_request.h b/src/components/application_manager/include/application_manager/commands/mobile/perform_audio_pass_thru_request.h
index 6e0e634459..efe1f107f3 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/perform_audio_pass_thru_request.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/perform_audio_pass_thru_request.h
@@ -159,10 +159,6 @@ class PerformAudioPassThruRequest : public CommandRequestImpl {
    */
   bool IsWaitingHMIResponse();
 
-  /* flag display state of speak and ui perform audio
-  during perform audio pass thru*/
-  bool awaiting_tts_speak_response_;
-  bool awaiting_ui_response_;
   /**
    * @brief Pair of result_code and success for mobile app
    */
diff --git a/src/components/application_manager/src/command_holder_impl.cc b/src/components/application_manager/src/command_holder_impl.cc
index 4e2cf89f57..673d40d148 100644
--- a/src/components/application_manager/src/command_holder_impl.cc
+++ b/src/components/application_manager/src/command_holder_impl.cc
@@ -58,7 +58,7 @@ void CommandHolderImpl::Suspend(
   } else {
     app_mobile_commands_[application].push_back(command);
     LOG4CXX_DEBUG(logger_,
-                  "Suspended mobile command(s): " << app_hmi_commands_.size());
+                  "Suspended mobile command(s): " << app_mobile_commands_.size());
   }
 }
 
diff --git a/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc b/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc
index 741c075310..8815334dc1 100644
--- a/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc
+++ b/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc
@@ -100,6 +100,11 @@ void IAP2USBEmulationTransportAdapter::DeviceSwitched(
   auto out_ = open(out_signals_channel, O_WRONLY);
   LOG4CXX_DEBUG(logger_, "Out channel descriptor: " << out_);
 
+  if(out_ < 0) {
+    LOG4CXX_ERROR(logger_, "Failed to open out signals channel");
+    return;
+  }
+
   const auto bytes =
       write(out_, switch_signal_ack.c_str(), switch_signal_ack.size());
   UNUSED(bytes);
@@ -107,6 +112,7 @@ void IAP2USBEmulationTransportAdapter::DeviceSwitched(
 
   LOG4CXX_DEBUG(logger_, "Switching signal ACK is sent");
   LOG4CXX_DEBUG(logger_, "iAP2 USB device is switched with iAP2 Bluetooth");
+  close(out_);
 }
 
 DeviceType IAP2USBEmulationTransportAdapter::GetDeviceType() const {
@@ -128,11 +134,15 @@ void IAP2USBEmulationTransportAdapter::IAPSignalHandlerDelegate::threadMain() {
 
   in_ = open(in_signals_channel, O_RDONLY);
   LOG4CXX_DEBUG(logger_, "In channel descriptor: " << in_);
+  if(in_ < 0) {
+    LOG4CXX_ERROR(logger_, "Failed to open in signals channel");
+    return;
+  }
 
   const auto size = 32;
   while (run_flag_) {
     char buffer[size];
-    auto bytes = read(in_, &buffer, size);
+    auto bytes = read(in_, &buffer, size-1);
     if (0 == bytes) {
       continue;
     }
@@ -141,6 +151,7 @@ void IAP2USBEmulationTransportAdapter::IAPSignalHandlerDelegate::threadMain() {
       break;
     }
     LOG4CXX_DEBUG(logger_, "Read in bytes: " << bytes);
+    buffer[bytes] = '\0';
     std::string str(buffer);
     if (std::string::npos != str.find(switch_signal)) {
       LOG4CXX_DEBUG(logger_, "Switch signal received.");