Merge remote-tracking branch 'origin/dev'

sanny32 · sanny32 · commit 36be7cb0199e · 2026-03-19T08:02:25.000+03:00
diff --git a/README.md b/README.md
@@ -122,19 +122,19 @@ Below are the methods for installing the OpenModScan for different OS
 ## <img src="docs/icons/logo_windows.svg" width="16" height="16"> Microsoft Windows
 Run the installer:
 
-- For 32-bit Windows: `qt5-omodscan_1.14.0_x86.exe`
-- For 64-bit Windows: `qt5-omodscan_1.14.0_x64.exe` or `qt6-omodscan_1.14.0_x64.exe`
+- For 32-bit Windows: `qt5-omodscan_1.14.1_x86.exe`
+- For 64-bit Windows: `qt5-omodscan_1.14.1_x64.exe` or `qt6-omodscan_1.14.1_x64.exe`
 
 
 ## <img src="docs/icons/logo_debian.svg" width="20" height="20"> Debian • <img src="docs/icons/logo_ubuntu.svg" width="20" height="20"> Ubuntu • <img width="20" height="20" src="docs/icons/logo_mint.png" /> Mint • <img src="docs/icons/logo_zorin.png" width="20" height="20"> Zorin • <img width="22" height="22" src="docs/icons/logo_astra.png" /> Astra Linux
 ### Install
 Install the DEB package from the command line:
 ```bash
-sudo apt install ./qt6-omodscan_1.14.0-1_amd64.deb
+sudo apt install ./qt6-omodscan_1.14.1-1_amd64.deb
 ```
 or if you want to use Qt5 libraries:
 ```bash
-sudo apt install ./qt5-omodscan_1.14.0-1_amd64.deb
+sudo apt install ./qt5-omodscan_1.14.1-1_amd64.deb
 ```
 
 ### Remove
@@ -151,7 +151,7 @@ sudo apt remove qt5-omodscan
 ### Install
 Install the RPM package from the command line:
 ```bash
-sudo dnf install ./qt6-omodscan_1.14.0-1.x86_64.rpm
+sudo dnf install ./qt6-omodscan_1.14.1-1.x86_64.rpm
 ```
 
 ### Remove
@@ -164,7 +164,7 @@ sudo dnf remove qt6-omodscan
 ### Install
 Install the RPM package from the command line as root user:
 ```bash
-apt-get install ./qt6-omodscan_1.14.0-1.x86_64.rpm
+apt-get install ./qt6-omodscan_1.14.1-1.x86_64.rpm
 ```
 
 ### Remove
@@ -181,7 +181,7 @@ sudo rpm --import qt6-omodscan.rpm.pubkey
 ```
 Install the RPM package using Zypper:
 ```bash
-sudo zypper install ./qt6-omodscan_1.14.0-1.x86_64.rpm
+sudo zypper install ./qt6-omodscan_1.14.1-1.x86_64.rpm
 ```
 
 ### Remove
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(omodscan
-    VERSION 1.14.0
+    VERSION 1.14.1
     DESCRIPTION "An Open Source Modbus Master (Client) Utility"
     LANGUAGES CXX)
 
diff --git a/src/controls/numericlineedit.cpp b/src/controls/numericlineedit.cpp
@@ -297,12 +297,6 @@ void NumericLineEdit::internalSetValue(QVariant value)
                 if(text != QLineEdit::text())
                     QLineEdit::setText(text);
             }
-            else if(_leadingZeroes)
-            {
-                const auto text = QStringLiteral("%1").arg(value.toInt(), _leadingZeroWidth, 10, QLatin1Char('0'));
-                if(text != QLineEdit::text())
-                    QLineEdit::setText(text);
-            }
             else
             {
                 const auto text = QString::number(value.toInt());
@@ -391,12 +385,6 @@ void NumericLineEdit::internalSetValue(QVariant value)
                 if(text != QLineEdit::text())
                     QLineEdit::setText(text);
             }
-            else if(_leadingZeroes)
-            {
-                const auto text = QStringLiteral("%1").arg(value.toLongLong(), _leadingZeroWidth, 10, QLatin1Char('0'));
-                if(text != QLineEdit::text())
-                    QLineEdit::setText(text);
-            }
             else
             {
                 const auto text = QString::number(value.toLongLong());
@@ -760,7 +748,6 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to
             else
             {
                 const int nums = QString::number(top.toInt()).length();
-                _leadingZeroWidth = qMax(1, nums);
                 setMaxLength(qMax(2, nums + 1));
                 setValidator(new QIntValidator(bottom.toInt(), top.toInt(), this));
             }
@@ -814,7 +801,6 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to
             else
             {
                 const int nums = QString::number(top.toLongLong()).length();
-                _leadingZeroWidth = qMax(1, nums);
                 setMaxLength(qMax(2, nums + 1));
                 setValidator(new QInt64Validator(bottom.toLongLong(), top.toLongLong(), this));
             }
diff --git a/src/dialogs/dialogwriteholdingregister.cpp b/src/dialogs/dialogwriteholdingregister.cpp
@@ -170,6 +170,7 @@ DialogWriteHoldingRegister::DialogWriteHoldingRegister(ModbusWriteParams& params
         ui->groupBoxBitPattern->setCheckState(toCheckState(_writeParams.Value.toUInt()));
 
         connect(ui->lineEditValue, QOverload<const QVariant&>::of(&NumericLineEdit::valueChanged), this, [this](const QVariant& value) {
+            QSignalBlocker blocker(ui->controlBitPattern);
             ui->controlBitPattern->setValue(value.toUInt());
         });
 
diff --git a/src/qmodbusadurtu.h b/src/qmodbusadurtu.h
@@ -10,6 +10,9 @@
 class QModbusAduRtu : public QModbusAdu
 {
 public:
+    /// Minimum RTU frame size: address(1) + function(1) + data(0+) + CRC(2)
+    static constexpr int MinRtuFrameSize = 4;
+
     explicit QModbusAduRtu(const QByteArray& rawData)
         : QModbusAdu()
     {
@@ -21,6 +24,8 @@ class QModbusAduRtu : public QModbusAdu
     /// \return
     ///
     bool isValid() const override {
+        if (_data.size() < MinRtuFrameSize)
+            return false;
         return matchingChecksum() && _pdu.isValid();
     }
 
@@ -30,15 +35,23 @@ class QModbusAduRtu : public QModbusAdu
     ///
     void setRawData(const QByteArray& data) override {
         _data = data;
-        _pdu.setFunctionCode(QModbusPdu::FunctionCode((quint8)_data[1]));
-        _pdu.setData(_data.mid(2, _data.size() - 4));
+        if (_data.size() >= MinRtuFrameSize) {
+            _pdu.setFunctionCode(QModbusPdu::FunctionCode(quint8(_data[1])));
+            _pdu.setData(_data.mid(2, _data.size() - MinRtuFrameSize));
+        } else {
+            _pdu.setFunctionCode(QModbusPdu::Invalid);  // reset to invalid state
+            _pdu.setData(QByteArray());
+        }
     }
 
     ///
     /// \brief serverAddress
     /// \return
     ///
     quint8 serverAddress() const override {
+        if (_data.isEmpty())
+            return 0;
+
         return quint8(_data[0]);
     }
 
@@ -47,17 +60,23 @@ class QModbusAduRtu : public QModbusAdu
     /// \return
     ///
     quint16 checksum() const {
-        return makeUInt16(_data[_data.size() - 1], _data[_data.size() - 2], ByteOrder::Direct);
+        if (_data.size() >= MinRtuFrameSize) {
+            return makeUInt16(_data[_data.size() - 1], _data[_data.size() - 2], ByteOrder::Direct);
+        }
+        return 0;
     }
 
     ///
     /// \brief calcChecksum
     /// \return
     ///
     quint16 calcChecksum() const {
-        const auto size = _data.size() - 2; // two bytes, CRC
-        const auto data = _data.left(size);
-        return calculateCRC(data, size);
+        if (_data.size() < MinRtuFrameSize)
+            return 0;
+
+        const int crcDataSize = _data.size() - 2;
+        const QByteArray crcData = _data.left(crcDataSize);
+        return calculateCRC(crcData.constData(), crcDataSize);
     }
 
     ///
@@ -68,7 +87,10 @@ class QModbusAduRtu : public QModbusAdu
         return checksum() == calcChecksum();
     }
 
-    inline static quint16 calculateCRC(const char* data, qint32 len){
+    inline static quint16 calculateCRC(const char* data, qint32 len) {
+        if (len <= 0 || data == nullptr)
+            return 0;
+
         quint16 crc = 0xFFFF;
         while (len--) {
             const quint8 c = *data++;
@@ -82,12 +104,12 @@ class QModbusAduRtu : public QModbusAdu
             }
             crc &= 0xFFFF;
         }
-        crc = crc_reflect(crc & 0xFFFF, 16) ^ 0x0000;
-        return (crc >> 8) | (crc << 8); // swap bytes
+        crc = crc_reflect(crc, 16);
+        return (crc >> 8) | (crc << 8);  // swap bytes
     }
 
 private:
-    inline static quint16 crc_reflect(quint16 data, qint32 len){
+    inline static quint16 crc_reflect(quint16 data, qint32 len) {
         quint16 ret = data & 0x01;
         for (qint32 i = 1; i < len; i++) {
             data >>= 1;
diff --git a/src/qmodbusadutcp.h b/src/qmodbusadutcp.h
@@ -10,6 +10,9 @@
 class QModbusAduTcp : public QModbusAdu
 {
 public:
+    /// Minimum TCP frame size: header(6) + unitId(1) + function(1) = 8 bytes
+    static constexpr int MinTcpFrameSize = 8;
+
     explicit QModbusAduTcp(const QByteArray& rawData)
         : QModbusAdu()
     {
@@ -21,6 +24,9 @@ class QModbusAduTcp : public QModbusAdu
     /// \return
     ///
     bool isValid() const override {
+        if (_data.size() < MinTcpFrameSize)
+            return false;
+
         return _pdu.isValid() && length() == _pdu.size() + 1;
     }
 
@@ -30,15 +36,23 @@ class QModbusAduTcp : public QModbusAdu
     ///
     void setRawData(const QByteArray& data) override {
         _data = data;
-        _pdu.setFunctionCode(QModbusPdu::FunctionCode((quint8)_data[7]));
-        _pdu.setData(_data.mid(8));
+        if (_data.size() >= MinTcpFrameSize) {
+            _pdu.setFunctionCode(QModbusPdu::FunctionCode(quint8(_data[7])));
+            _pdu.setData(_data.mid(8, _data.size() - MinTcpFrameSize));
+        } else {
+            _pdu.setFunctionCode(QModbusPdu::Invalid);  // reset to invalid state
+            _pdu.setData(QByteArray());
+        }
     }
 
     ///
     /// \brief transactionId
     /// \return
     ///
     quint16 transactionId() const {
+        if (_data.size() < MinTcpFrameSize)
+            return 0;
+
         return makeUInt16(_data[1], _data[0], ByteOrder::Direct);
     }
 
@@ -47,6 +61,9 @@ class QModbusAduTcp : public QModbusAdu
     /// \param id
     ///
     void setTransactionId(quint16 id) {
+        if (_data.size() < MinTcpFrameSize)
+            return;
+
         quint8 lo,hi;
         breakUInt16(id, lo, hi, ByteOrder::Direct);
         _data[1] = lo; _data[0] = hi;
@@ -57,6 +74,9 @@ class QModbusAduTcp : public QModbusAdu
     /// \return
     ///
     quint16 protocolId() const {
+        if (_data.size() < MinTcpFrameSize)
+            return 0;
+
         return makeUInt16(_data[3], _data[2], ByteOrder::Direct);
     }
 
@@ -65,6 +85,9 @@ class QModbusAduTcp : public QModbusAdu
     /// \return
     ///
     quint16 length() const {
+        if (_data.size() < MinTcpFrameSize)
+            return 0;
+
         return makeUInt16(_data[5], _data[4], ByteOrder::Direct);
     }
 
@@ -73,6 +96,9 @@ class QModbusAduTcp : public QModbusAdu
     /// \return
     ///
     quint8 serverAddress() const override {
+        if (_data.size() < MinTcpFrameSize)
+            return 0;
+
         return quint8(_data[6]);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -297,12 +297,6 @@ void NumericLineEdit::internalSetValue(QVariant value)`
`297`	`297`	`if(text != QLineEdit::text())`
`298`	`298`	`QLineEdit::setText(text);`
`299`	`299`	`}`
`300`		`- else if(_leadingZeroes)`
`301`		`- {`
`302`		`- const auto text = QStringLiteral("%1").arg(value.toInt(), _leadingZeroWidth, 10, QLatin1Char('0'));`
`303`		`- if(text != QLineEdit::text())`
`304`		`- QLineEdit::setText(text);`
`305`		`- }`
`306`	`300`	`else`
`307`	`301`	`{`
`308`	`302`	`const auto text = QString::number(value.toInt());`
`@@ -391,12 +385,6 @@ void NumericLineEdit::internalSetValue(QVariant value)`
`391`	`385`	`if(text != QLineEdit::text())`
`392`	`386`	`QLineEdit::setText(text);`
`393`	`387`	`}`
`394`		`- else if(_leadingZeroes)`
`395`		`- {`
`396`		`- const auto text = QStringLiteral("%1").arg(value.toLongLong(), _leadingZeroWidth, 10, QLatin1Char('0'));`
`397`		`- if(text != QLineEdit::text())`
`398`		`- QLineEdit::setText(text);`
`399`		`- }`
`400`	`388`	`else`
`401`	`389`	`{`
`402`	`390`	`const auto text = QString::number(value.toLongLong());`
`@@ -760,7 +748,6 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to`
`760`	`748`	`else`
`761`	`749`	`{`
`762`	`750`	`const int nums = QString::number(top.toInt()).length();`
`763`		`- _leadingZeroWidth = qMax(1, nums);`
`764`	`751`	`setMaxLength(qMax(2, nums + 1));`
`765`	`752`	`setValidator(new QIntValidator(bottom.toInt(), top.toInt(), this));`
`766`	`753`	`}`
`@@ -814,7 +801,6 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to`
`814`	`801`	`else`
`815`	`802`	`{`
`816`	`803`	`const int nums = QString::number(top.toLongLong()).length();`
`817`		`- _leadingZeroWidth = qMax(1, nums);`
`818`	`804`	`setMaxLength(qMax(2, nums + 1));`
`819`	`805`	`setValidator(new QInt64Validator(bottom.toLongLong(), top.toLongLong(), this));`
`820`	`806`	`}`