summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackLivio <jack@livio.io>2016-07-26 18:37:06 -0400
committerGitHub <noreply@github.com>2016-07-26 18:37:06 -0400
commit408b16921c0ae327a5feb58749149ddffedcb226 (patch)
tree954f025fc6ef7698a6e9d796f56149c97dcb3f86
parent343db2aec311e8c7cb9f35bb1a38f654b0ca8efa (diff)
parent2bd169cbb73cbc34dddea6dc7ff43c9f63d40e4d (diff)
downloadsdl_core-408b16921c0ae327a5feb58749149ddffedcb226.tar.gz
Merge pull request #715 from BTPankow/hotfix/coverity_buffer_termination
Null terminate char buffer after strncpy (CID 79979)
-rw-r--r--src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc b/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc
index c422d895d0..2a5eb35162 100644
--- a/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc
+++ b/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc
@@ -230,9 +230,11 @@ void BluetoothDeviceScanner::CheckSDLServiceOnDevices(
if (hci_read_remote_name_ret != 0) {
LOG4CXX_ERROR_WITH_ERRNO(logger_, "hci_read_remote_name failed");
+ int name_len = sizeof(deviceName) / sizeof(deviceName[0]);
strncpy(deviceName,
BluetoothDevice::GetUniqueDeviceId(bd_address).c_str(),
- sizeof(deviceName) / sizeof(deviceName[0]));
+ name_len - 1);
+ deviceName[name_len - 1] = '\0';
}
Device* bluetooth_device = new BluetoothDevice(bd_address, deviceName,