From 0f33c698229ebb418b71a19dd409e2b5a417182e Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Mon, 13 Nov 2017 20:36:08 +0100 Subject: CAN: Improve checking for unsupported CAN FD frames The check for the correct data length is already done by QCanBusFrame::isValid. Plugins that don't support CAN FD should rather check for the CAN FD flag and discard CAN FD frames with payload length < 8 also. [ChangeLog][CAN bus plugins] The CAN bus plugins that don't support CAN FD now also discard CAN FD frames with payload length < 8. Change-Id: I5a699a497b79dab2b8960fadc7fa30dbda6c4a62 Reviewed-by: Denis Shienkov Reviewed-by: Alex Blasche Reviewed-by: Rolf Eike Beer --- src/plugins/canbus/peakcan/peakcanbackend.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/canbus/peakcan/peakcanbackend.cpp') diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp index 6dd87da..6f3ebba 100644 --- a/src/plugins/canbus/peakcan/peakcanbackend.cpp +++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp @@ -532,7 +532,7 @@ bool PeakCanBackend::writeFrame(const QCanBusFrame &newData) } // CAN FD frame format not implemented at this stage - if (Q_UNLIKELY(newData.payload().size() > 8)) { + if (Q_UNLIKELY(newData.hasFlexibleDataRateFormat())) { setError(tr("CAN FD frame format not supported."), QCanBusDevice::WriteError); return false; } -- cgit v1.2.3