Fix crash

src/VehicleSetup/Bootloader.cc

@@ -51,14 +51,12 @@ bool Bootloader::_write(QSerialPort* port, const uint8_t byte)
     return _write(port, buf, 1);
 }
 
-bool Bootloader::_read(QSerialPort* port, uint8_t* data, qint64 maxSize, int readTimeout)
+bool Bootloader::_read(QSerialPort* port, uint8_t* data, qint64 cBytesExpected, int readTimeout)
 {
-    qint64 bytesAlreadyRead = 0;
-
-    while (bytesAlreadyRead < maxSize) {
     QElapsedTimer timeout;
+
     timeout.start();
-        while (port->bytesAvailable() < 1) {
+    while (port->bytesAvailable() < cBytesExpected) {
         if (timeout.elapsed() > readTimeout) {
             _errorString = tr("Timeout waiting for bytes to be available");
             return false;
@@ -67,15 +65,11 @@ bool Bootloader::_read(QSerialPort* port, uint8_t* data, qint64 maxSize, int rea
     }
 
     qint64 bytesRead;
-        bytesRead = port->read((char*)&data[bytesAlreadyRead], maxSize);
+    bytesRead = port->read((char *)data, cBytesExpected);
 
-        if (bytesRead == -1) {
+    if (bytesRead != cBytesExpected) {
         _errorString = tr("Read failed: error: %1").arg(port->errorString());
         return false;
-        } else {
-            Q_ASSERT(bytesRead != 0);
-            bytesAlreadyRead += bytesRead;
-        }
     }
 
     return true;

src/VehicleSetup/Bootloader.h

@@ -96,7 +96,7 @@ private:
     bool _write(QSerialPort* port, const uint8_t* data, qint64 maxSize);
     bool _write(QSerialPort* port, const uint8_t byte);
     
-    bool _read(QSerialPort* port, uint8_t* data, qint64 maxSize, int readTimeout = _readTimout);
+    bool _read(QSerialPort* port, uint8_t* data, qint64 cBytesExpected, int readTimeout = _readTimout);
     
     bool _sendCommand(QSerialPort* port, uint8_t cmd, int responseTimeout = _responseTimeout);
     bool _getCommandResponse(QSerialPort* port, const int responseTimeout = _responseTimeout);