Fix mozilla#14: Set WEP keys only if provided

lissyx · Jun 5, 2020 · 1e8a0dd · 1e8a0dd
1 parent b220dac
commit 1e8a0dd
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/dom/wifi/hal/SupplicantStaNetwork.cpp b/dom/wifi/hal/SupplicantStaNetwork.cpp
@@ -115,11 +115,13 @@ Result_t SupplicantStaNetwork::SetConfiguration(
   }
 
   // wep key
-  std::array<std::string, max_wep_key_num> wepKeys = {
-      config.mWepKey0, config.mWepKey1, config.mWepKey2, config.mWepKey3};
-  stateCode = SetWepKey(wepKeys, aConfig.mWepTxKeyIndex);
-  if (stateCode != SupplicantStatusCode::SUCCESS) {
-    return ConvertStatusToResult(stateCode);
+  if (!config.mWepKey0.empty()) {
+    std::array<std::string, max_wep_key_num> wepKeys = {
+        config.mWepKey0, config.mWepKey1, config.mWepKey2, config.mWepKey3};
+    stateCode = SetWepKey(wepKeys, aConfig.mWepTxKeyIndex);
+    if (stateCode != SupplicantStatusCode::SUCCESS) {
+      return ConvertStatusToResult(stateCode);
+    }
   }
 
   // proto