Abort controller activation when there is no current device (#8694)

mozilla-mobile · Nov 29, 2023 · 9d0e326 · 9d0e326
1 parent 4640992
commit 9d0e326
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/controller.cpp b/src/controller.cpp
@@ -350,6 +350,11 @@ void Controller::activateInternal(DNSPortPolicy dnsPort,
 
   MozillaVPN* vpn = MozillaVPN::instance();
   const Device* device = vpn->deviceModel()->currentDevice(vpn->keys());
+  if (!device) {
+    logger.warning() << "No current device. Aborting activation.";
+    m_nextStep = Disconnect;
+    return;
+  }
   SettingsHolder* settingsHolder = SettingsHolder::instance();
 
   // Prepare the exit server's connection data.