diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2021-03-02 15:21:48 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2021-03-04 00:59:53 +0100 |
| commit | 144c367b36fd9b66f58e38dc85f27da10469cdf9 (patch) | |
| tree | d3e35e79e92d60f70a5a2972b3e20b347c8abcaf | |
| parent | 10e4ff602f5ab415bf057ac779f35f0e60b849b2 (diff) | |
Fix minor warnings
* Unintended copy instead of capturing a reference
* Temporary value might overflow before assignment
Change-Id: I0d53699456ec724d479b3e9015a03c6df4a17654
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/serialbus/qmodbusrtuserialclient_p.h | 2 | ||||
| -rw-r--r-- | src/serialbus/qmodbustcpserver_p.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/serialbus/qmodbusrtuserialclient_p.h b/src/serialbus/qmodbusrtuserialclient_p.h index 69a64ca..e7ee703 100644 --- a/src/serialbus/qmodbusrtuserialclient_p.h +++ b/src/serialbus/qmodbusrtuserialclient_p.h @@ -201,7 +201,7 @@ public: m_responseTimer.stop(); if (m_state != State::WaitingForReplay || m_queue.isEmpty()) return; - const auto current = m_queue.first(); + const auto ¤t = m_queue.first(); if (current.m_timerId != timerId) return; diff --git a/src/serialbus/qmodbustcpserver_p.h b/src/serialbus/qmodbustcpserver_p.h index c9f37ff..26b1b55 100644 --- a/src/serialbus/qmodbustcpserver_p.h +++ b/src/serialbus/qmodbustcpserver_p.h @@ -174,7 +174,8 @@ public: // Identifier and the PDU, so we remove on byte. bytesPdu--; - if (buffer->size() < mbpaHeaderSize + bytesPdu) { + const quint16 current = mbpaHeaderSize + bytesPdu; + if (buffer->size() < current) { qCDebug(QT_MODBUS) << "(TCP server) PDU too short. Waiting for more data"; return; } @@ -182,7 +183,7 @@ public: QModbusRequest request; input >> request; - buffer->remove(0, mbpaHeaderSize + bytesPdu); + buffer->remove(0, current); if (!matchingServerAddress(unitId)) continue; |