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

chrome/browser/chromeos/options/network_config_view.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/options/network_config_view.h"
 
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/options/cellular_config_view.h"
 #include "chrome/browser/chromeos/options/ip_config_view.h"
 #include "chrome/browser/chromeos/options/wifi_config_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget_gtk.h"
 #include "views/window/window.h"
 
 using views::WidgetGtk;
 
 namespace chromeos {
 
-NetworkConfigView::NetworkConfigView(EthernetNetwork ethernet)
+NetworkConfigView::NetworkConfigView(const EthernetNetwork* ethernet)
     : browser_mode_(true),
       flags_(FLAG_ETHERNET | FLAG_SHOW_IPCONFIG),
-      ethernet_(ethernet),
+      ethernet_(new EthernetNetwork(*ethernet)),
       cellularconfig_view_(NULL),
       wificonfig_view_(NULL),
       ipconfig_view_(NULL),
       delegate_(NULL) {
 }
 
-NetworkConfigView::NetworkConfigView(WifiNetwork wifi, bool login_only)
+NetworkConfigView::NetworkConfigView(const WifiNetwork* wifi, bool login_only)
     : browser_mode_(true),
       flags_(FLAG_WIFI),
-      wifi_(wifi),
+      wifi_(new WifiNetwork(*wifi)),
       cellularconfig_view_(NULL),
       wificonfig_view_(NULL),
       ipconfig_view_(NULL),
       delegate_(NULL) {
   if (login_only)
     flags_ |= FLAG_LOGIN_ONLY;
   else
     flags_ |= FLAG_SHOW_IPCONFIG;
 }
 
-NetworkConfigView::NetworkConfigView(CellularNetwork cellular)
+NetworkConfigView::NetworkConfigView(const CellularNetwork* cellular)
     : browser_mode_(true),
       flags_(FLAG_CELLULAR | FLAG_SHOW_IPCONFIG),
-      cellular_(cellular),
+      cellular_(new CellularNetwork(*cellular)),
       cellularconfig_view_(NULL),
       wificonfig_view_(NULL),
       ipconfig_view_(NULL),
       delegate_(NULL) {
 }
 
 NetworkConfigView::NetworkConfigView()
     : browser_mode_(true),
       flags_(FLAG_WIFI | FLAG_LOGIN_ONLY | FLAG_OTHER_NETWORK),
+      ethernet_(NULL),
+      wifi_(NULL),
+      cellular_(NULL),
       cellularconfig_view_(NULL),
       wificonfig_view_(NULL),
       ipconfig_view_(NULL),
       delegate_(NULL) {
 }
 
+NetworkConfigView::~NetworkConfigView() {
+  if (ethernet_)
+    delete ethernet_;
+  if (wifi_)
+    delete wifi_;
+  if (cellular_)
+    delete cellular_;
+}
+
 gfx::NativeWindow NetworkConfigView::GetNativeWindow() const {
   return GTK_WINDOW(static_cast<WidgetGtk*>(GetWidget())->GetNativeView());
 }
 
 std::wstring NetworkConfigView::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
     if (flags_ & FLAG_LOGIN_ONLY)
       return l10n_util::GetString(IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN);
     else
@@ skipping 29 matching lines @@
   }
   if (result && delegate_)
     delegate_->OnDialogAccepted();
   return result;
 }
 
 std::wstring NetworkConfigView::GetWindowTitle() const {
   if (flags_ & FLAG_OTHER_NETWORK)
     return l10n_util::GetString(IDS_OPTIONS_SETTINGS_OTHER_NETWORKS);
   if (flags_ & FLAG_WIFI)
-    return ASCIIToWide(wifi_.name());
+    return ASCIIToWide(wifi_->name());
   if (flags_ & FLAG_CELLULAR)
-    return ASCIIToWide(cellular_.name());
+    return ASCIIToWide(cellular_->name());
   return l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
 }
 
 void NetworkConfigView::TabSelectedAt(int index) {
 }
 
 void NetworkConfigView::SetLoginTextfieldFocus() {
   if (wificonfig_view_)
     wificonfig_view_->FocusFirstField();
 }
@@ skipping 57 matching lines @@
       wificonfig_view_ = new WifiConfigView(this);
     else
       wificonfig_view_ = new WifiConfigView(this, wifi_);
     tabs_->AddTab(
         l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_NETWORK_CONFIG),
         wificonfig_view_);
   }
 
   if (flags_ & FLAG_SHOW_IPCONFIG) {
     if (flags_ & FLAG_WIFI)
-      ipconfig_view_ = new IPConfigView(wifi_.device_path());
+      ipconfig_view_ = new IPConfigView(wifi_->device_path());
     else if (flags_ & FLAG_CELLULAR)
-      ipconfig_view_ = new IPConfigView(cellular_.device_path());
+      ipconfig_view_ = new IPConfigView(cellular_->device_path());
     else
-      ipconfig_view_ = new IPConfigView(ethernet_.device_path());
+      ipconfig_view_ = new IPConfigView(ethernet_->device_path());
     tabs_->AddTab(
         l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_IP_CONFIG),
         ipconfig_view_);
   }
 }
 
 }  // namespace chromeos