Merge pull request #370 from jmlich/bips-crash

Avoid crash if firmware info is null
piggz · May 12, 2024 · 8198238 · 8198238
2 parents 62460cc + ef05b2f
commit 8198238
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/daemon/src/deviceinterface.cpp b/daemon/src/deviceinterface.cpp
@@ -747,6 +747,10 @@ QString DeviceInterface::prepareFirmwareDownload(const QString &path)
             return QString();
         }
         m_firmwareInfo = m_device->firmwareInfo(file.readAll());
+        if (m_firmwareInfo == nullptr) {
+            qWarning() << "m_firmwareInfo is NULL";
+            return QString();
+        }
         if (m_firmwareInfo->type() != AbstractFirmwareInfo::Invalid) {
             m_device->prepareFirmwareDownload(m_firmwareInfo);
             return m_firmwareInfo->version();
@@ -760,6 +764,11 @@ bool DeviceInterface::startDownload()
     qDebug() << Q_FUNC_INFO;
     auto config = AmazfishConfig::instance();
 
+    if (m_firmwareInfo == nullptr) {
+        qWarning() << "m_firmwareInfo is NULL";
+        return false;
+    }
+
     if (m_firmwareInfo->supportedOnDevice(m_device->deviceName()) || config->appOverrideFwCheck()) {
         m_device->startDownload();
         return true;