Merge pull request #1053 from deXol/develop

[BLE] Handle invalid character in BLE name
mooltipass · Jun 15, 2022 · 7261dc3 · 7261dc3
2 parents 0000aca + b14984f
commit 7261dc3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/MPDeviceBleImpl.cpp b/src/MPDeviceBleImpl.cpp
@@ -1906,8 +1906,14 @@ void MPDeviceBleImpl::getBleName(const MessageHandlerCbData &cb)
     connect(jobs, &AsyncJobs::finished, [this, cb](const QByteArray &data)
     {
         Q_UNUSED(data);
-        /* Callback */
-        cb(true, "", bleProt->getFullPayload(data));
+        QByteArray bleNameArr = bleProt->getFullPayload(data);
+        if (ZERO_BYTE == bleNameArr[0] || static_cast<char>(0xFF) == bleNameArr[0])
+        {
+            // Handle invalid character in BLE name (starts with 0x00 or 0xFF)
+            bleNameArr = DEFAULT_BLE_NAME.toUtf8();
+            qWarning() << "Invalid character in BLE name";
+        }
+        cb(true, "", bleNameArr);
     });
 
     mpDev->enqueueAndRunJob(jobs);

diff --git a/src/WSServerCon.cpp b/src/WSServerCon.cpp
@@ -1564,7 +1564,7 @@ void WSServerCon::processMessageBLE(QJsonObject root, const MPDeviceProgressCb &
     }
     else if (root["msg"] == "get_ble_name")
     {
-        bleImpl->getBleName([this, root, bleImpl](bool success, QString, QByteArray data)
+        bleImpl->getBleName([this, root](bool success, QString, QByteArray data)
         {
             if (!WSServer::Instance()->checkClientExists(this))
                 return;