From 90712efc5b42d31066a388aa370a388c09da6e24 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Fri, 12 Aug 2016 12:51:50 +0200 Subject: SocketCAN: Remove redundant include qcanbusdevice.h is already included in socketcanbackend.h Change-Id: Ibcc50712c807b1e880b11d36e8dab08fcbcf9f2e Reviewed-by: Alex Blasche --- src/plugins/canbus/socketcan/socketcanbackend.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/plugins/canbus/socketcan') diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index 87c466e..b902b80 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -35,7 +35,6 @@ ****************************************************************************/ #include "socketcanbackend.h" -#include #include #include -- cgit v1.2.3 From 46c3db77f3289cced28e39aefa03f175b61cdcfc Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Tue, 9 Aug 2016 11:47:54 +0200 Subject: SocketCAN: Use qstrncpy instead strcpy * Copies at most sizeof(ifr_name) bytes * Guarantees that ifr_name is zero-terminated Change-Id: I68966767002dbe5f349ce9f03f34f4657d1827e9 Reviewed-by: Alex Blasche --- src/plugins/canbus/socketcan/socketcanbackend.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/canbus/socketcan') diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index b902b80..60f36f9 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -265,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); -- cgit v1.2.3