diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-08-30 16:44:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-30 16:44:14 -0400 |
| commit | ddc79ce414adcd966bdab61b814ce8a422e780f8 (patch) | |
| tree | bae3c94d7c8515bc4c94626728d2d193a7beded5 | |
| parent | 2d83e5985347754b1d5e56266b6b9fc75d00a193 (diff) | |
| parent | 2df724177ee1e8b74fce847ca44b5224a756f340 (diff) | |
| download | sdl_core-ddc79ce414adcd966bdab61b814ce8a422e780f8.tar.gz | |
Merge pull request #2178 from XevoInc/bugfix/invalid_memory_accesses
Bugfix/invalid memory accesses
| -rw-r--r-- | src/components/media_manager/src/streamer_adapter.cc | 2 | ||||
| -rw-r--r-- | src/components/transport_manager/src/bluetooth/bluetooth_device.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/components/media_manager/src/streamer_adapter.cc b/src/components/media_manager/src/streamer_adapter.cc index 90a40b1add..37cb1426dc 100644 --- a/src/components/media_manager/src/streamer_adapter.cc +++ b/src/components/media_manager/src/streamer_adapter.cc @@ -48,8 +48,8 @@ StreamerAdapter::~StreamerAdapter() { streamer_->Close(); } thread_->join(); - threads::DeleteThread(thread_); delete streamer_; + threads::DeleteThread(thread_); } void StreamerAdapter::StartActivity(int32_t application_key) { diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_device.cc b/src/components/transport_manager/src/bluetooth/bluetooth_device.cc index 038515170d..e7cc3d4f34 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_device.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_device.cc @@ -45,6 +45,7 @@ #include <sys/socket.h> #include <algorithm> +#include <iostream> #include <limits> #include "utils/logger.h" @@ -56,7 +57,8 @@ bool BluetoothDevice::GetRfcommChannel(const ApplicationHandle app_handle, uint8_t* channel_out) { LOG4CXX_TRACE(logger_, "enter. app_handle: " << app_handle - << ", channel_out: " << channel_out); + << ", channel_out: " << std::hex + << reinterpret_cast<void*>(channel_out)); if (app_handle < 0 || app_handle > std::numeric_limits<uint8_t>::max()) { LOG4CXX_TRACE(logger_, "exit with FALSE. Condition: app_handle < 0 || app_handle > " |