diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:21 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:21 +0200 |
commit | e13f9fe6a857995a3267f6b77ea11aadb0cb3c4a (patch) | |
tree | 42f54556222459d08abb10bfa6d84d3d3e13cb9f /src/plugins/canbus/socketcan | |
parent | 398eda8be9eb3415ca44cc35dad3422311d8e221 (diff) | |
parent | 3dfc46f069f3287c411ab178513d0ad47bf95352 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I68fd539f6065c6a8351c1d9bdf52f8b01b4ea923
Diffstat (limited to 'src/plugins/canbus/socketcan')
-rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index 87c466e..60f36f9 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -35,7 +35,6 @@ ****************************************************************************/ #include "socketcanbackend.h" -#include <QtSerialBus/qcanbusdevice.h> #include <QtCore/qdebug.h> #include <QtCore/qdatastream.h> @@ -266,7 +265,7 @@ bool SocketCanBackend::connectSocket() return false; } - strcpy(interface.ifr_name, canSocketName.toLatin1().data()); + qstrncpy(interface.ifr_name, canSocketName.toLatin1().constData(), sizeof(interface.ifr_name)); if (ioctl(canSocket, SIOCGIFINDEX, &interface) < 0) { setError(qt_error_string(errno), QCanBusDevice::CanBusError::ConnectionError); |