Rewritten parts of NetworkLibrary to work around memory corruption that prev...

chrome/browser/chromeos/network_list.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/network_list.h"
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "grit/generated_resources.h"
@@ skipping 47 matching lines @@
   if (!network_lib || !CrosLibrary::Get()->EnsureLoaded())
     return;
 
   bool ethernet_connected = network_lib->ethernet_connected();
   bool ethernet_connecting = network_lib->ethernet_connecting();
   if (ethernet_connected || ethernet_connecting) {
     string16 label = l10n_util::GetStringUTF16(
         IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
     networks_.push_back(NetworkItem(NETWORK_ETHERNET,
                                     label,
-                                    WifiNetwork(),
-                                    CellularNetwork()));
+                                    NULL,
+                                    NULL));
     AddNetworkIndexToList(index++, ethernet_connected, ethernet_connecting);
   }
 
   // TODO(nkostylev): Show public WiFi networks first.
-  WifiNetworkVector wifi = network_lib->wifi_networks();
+  const WifiNetworkVector& wifi = network_lib->wifi_networks();
   for (WifiNetworkVector::const_iterator it = wifi.begin();
        it != wifi.end(); ++it, ++index) {
     networks_.push_back(NetworkItem(NETWORK_WIFI,
-                                    ASCIIToUTF16(it->name()),
+                                    ASCIIToUTF16((*it)->name()),
                                     *it,
-                                    CellularNetwork()));
-    if (network_lib->wifi_network().service_path() == it->service_path()) {
+                                    NULL));
+    if (network_lib->wifi_network() &&
+        network_lib->wifi_network()->service_path() == (*it)->service_path()) {
       AddNetworkIndexToList(index,
                             network_lib->wifi_connected(),
                             network_lib->wifi_connecting());
     }
   }
 
-  CellularNetworkVector cellular = network_lib->cellular_networks();
+  const CellularNetworkVector& cellular = network_lib->cellular_networks();
   for (CellularNetworkVector::const_iterator it = cellular.begin();
        it != cellular.end(); ++it, ++index) {
     networks_.push_back(NetworkItem(NETWORK_CELLULAR,
-                                    ASCIIToUTF16(it->name()),
-                                    WifiNetwork(),
+                                    ASCIIToUTF16((*it)->name()),
+                                    NULL,
                                     *it));
-    if (network_lib->cellular_network().service_path() == it->service_path()) {
+    if (network_lib->cellular_network() &&
+        network_lib->cellular_network()->service_path() ==
+            (*it)->service_path()) {
       AddNetworkIndexToList(index,
                             network_lib->cellular_connected(),
                             network_lib->cellular_connecting());
     }
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkList, private:
 
@@ skipping 13 matching lines @@
 bool NetworkList::IsSameNetwork(const NetworkList::NetworkItem* network,
                                 NetworkType type,
                                 const std::string& id) const {
   if (type != network->network_type)
     return false;
   switch (type) {
     case NETWORK_ETHERNET:
       // Assuming that there's only single Ethernet network.
       return true;
     case NETWORK_WIFI:
-      return id == network->wifi_network.name();
+      return network->wifi_network && id == network->wifi_network->name();
       break;
     case NETWORK_CELLULAR:
-      return id == network->cellular_network.name();
+      return network->cellular_network &&
+          id == network->cellular_network->name();
       break;
     default:
       return false;
       break;
   }
 }
 
 void NetworkList::AddNetworkIndexToList(size_t index,
                                         bool connected,
                                         bool connecting) {
   if (connected) {
     connected_networks_.push_back(index);
   } else if (connecting) {
     connecting_networks_.push_back(index);
   }
 }
 
 }  // namespace chromeos