diff options
author | Sho Amano <samano@xevo.com> | 2018-05-09 12:39:56 +0900 |
---|---|---|
committer | fronneburg <fronneburg@xevo.com> | 2018-05-16 14:55:52 -0700 |
commit | 125ebf88d9765879f8ae0e60f121063a48a16d31 (patch) | |
tree | 7c254877b0cd783f98626072754bc042ebf8861b /src/components/transport_manager | |
parent | b4fe5081acb2eea341f228930ae8e98776937615 (diff) | |
download | sdl_core-125ebf88d9765879f8ae0e60f121063a48a16d31.tar.gz |
Merge pull request #260 in NAR/sdl-core from bugfix/invalid_memory_accesses to develop
* commit '36e6c8b736ead44207f9fc31ddb16c92700516fd':
fix: invalid memory access in RemoteControl when stopping Core
fix: invalid memory access in MediaManager when stopping Core
fix: invalid memory access in BluetoothDevice log message
Diffstat (limited to 'src/components/transport_manager')
-rw-r--r-- | src/components/transport_manager/src/bluetooth/bluetooth_device.cc | 4 |
1 files changed, 3 insertions, 1 deletions
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 > " |