diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-19 23:38:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-19 23:38:44 +0200 |
| commit | 7845b1c59bde8e2ec8dc541b9f1c1897182e8d0f (patch) | |
| tree | 0ac83501fd5f18bc8809817b046e698443748c35 /src/plugins/canbus/socketcan | |
| parent | b08292f3d5ff4d07b1649a365183b550729bd187 (diff) | |
| parent | e13f9fe6a857995a3267f6b77ea11aadb0cb3c4a (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/plugins/canbus/peakcan/main.cpp
src/plugins/canbus/tinycan/main.cpp
Change-Id: Ia2dac20ddfc27ba96bb36cd70ba011e2d3764f2f
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 8c3d9ee..c9781d1 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); |