There is a race condition when the HtmlDialogView is closed which causes a cr...

chrome/browser/views/html_dialog_view.cc

 // Copyright (c) 2006-2008 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/views/html_dialog_view.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 namespace browser {
 
-// Declared in browser_dialogs.h so that others don't need to depend on our .h. 
+// Declared in browser_dialogs.h so that others don't need to depend on our .h.
 void ShowHtmlDialogView(gfx::NativeWindow parent, Browser* browser,
                         HtmlDialogUIDelegate* delegate) {
   HtmlDialogView* html_view = new HtmlDialogView(browser, delegate);
   views::Window::CreateChromeWindow(parent, gfx::Rect(), html_view);
   html_view->InitDialog();
   html_view->window()->Show();
 }
 
 }  // namespace browser
 
@@ skipping 10 matching lines @@
 }
 
 HtmlDialogView::~HtmlDialogView() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogView, views::View implementation:
 
 gfx::Size HtmlDialogView::GetPreferredSize() {
   gfx::Size out;
-  delegate_->GetDialogSize(&out);
+  if (delegate_)
+    delegate_->GetDialogSize(&out);
   return out;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogView, views::WindowDelegate implementation:
 
 bool HtmlDialogView::CanResize() const {
   return true;
 }
 
 bool HtmlDialogView::IsModal() const {
-  return delegate_->IsDialogModal();
+  if (delegate_)
+    return delegate_->IsDialogModal();
+  else
+    return false;
 }
 
 std::wstring HtmlDialogView::GetWindowTitle() const {
-  return delegate_->GetDialogTitle();
+  if (delegate_)
+    return delegate_->GetDialogTitle();
+  else
+    return std::wstring();
 }
 
 void HtmlDialogView::WindowClosing() {
   // If we still have a delegate that means we haven't notified it of the
   // dialog closing. This happens if the user clicks the Close button on the
   // dialog.
   if (delegate_)
     OnDialogClosed("");
 }
 
@@ skipping 10 matching lines @@
 
 bool HtmlDialogView::IsDialogModal() const {
   return IsModal();
 }
 
 std::wstring HtmlDialogView::GetDialogTitle() const {
   return GetWindowTitle();
 }
 
 GURL HtmlDialogView::GetDialogContentURL() const {
-  return delegate_->GetDialogContentURL();
+  if (delegate_)
+    return delegate_->GetDialogContentURL();
+  else
+    return GURL();
 }
 
 void HtmlDialogView::GetDOMMessageHandlers(
     std::vector<DOMMessageHandler*>* handlers) const {
-  delegate_->GetDOMMessageHandlers(handlers);
+  if (delegate_)
+    delegate_->GetDOMMessageHandlers(handlers);
 }
 
 void HtmlDialogView::GetDialogSize(gfx::Size* size) const {
-  delegate_->GetDialogSize(size);
+  if (delegate_)
+    delegate_->GetDialogSize(size);
 }
 
 std::string HtmlDialogView::GetDialogArgs() const {
-  return delegate_->GetDialogArgs();
+  if (delegate_)
+    return delegate_->GetDialogArgs();
+  else
+    return std::string();
 }
 
 void HtmlDialogView::OnDialogClosed(const std::string& json_retval) {
-  delegate_->OnDialogClosed(json_retval);
+  HtmlDialogUIDelegate* dialog_delegate = delegate_;
   delegate_ = NULL;  // We will not communicate further with the delegate.
+  dialog_delegate->OnDialogClosed(json_retval);
   window()->Close();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabContentsDelegate implementation:
 
 void HtmlDialogView::OpenURLFromTab(TabContents* source,
                                     const GURL& url,
                                     const GURL& referrer,
                                     WindowOpenDisposition disposition,
@@ skipping 73 matching lines @@
 
   tab_contents_->set_delegate(this);
 
   // Set the delegate. This must be done before loading the page. See
   // the comment above HtmlDialogUI in its header file for why.
   HtmlDialogUI::GetPropertyAccessor().SetProperty(tab_contents_->property_bag(),
                                                   this);
 
   DOMView::LoadURL(delegate_->GetDialogContentURL());
 }