diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 21:21:53 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 21:21:53 +0000 |
| commit | 95e189595de350ae39d7ce09e2fc30ae2d81200c (patch) | |
| tree | 12bc5dfec355ce127aaeb9734c9a3c40fab1a76e | |
| parent | 1a8293725391b75a42265c2dd50b2d31e0ea8123 (diff) | |
| download | chromium_src-95e189595de350ae39d7ce09e2fc30ae2d81200c.zip chromium_src-95e189595de350ae39d7ce09e2fc30ae2d81200c.tar.gz chromium_src-95e189595de350ae39d7ce09e2fc30ae2d81200c.tar.bz2 | |
Merge 151451 - Fixed segmentation fault in ExtensionErrorUIDefault::ExtensionGlobalError::OnBubbleViewDidClose
BUG=142336
Review URL: https://chromiumcodereview.appspot.com/10832273
TBR=qfel@google.com
Review URL: https://chromiumcodereview.appspot.com/10857003
git-svn-id: svn://svn.chromium.org/chrome/branches/1229/src@151566 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_error_ui.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_error_ui_default.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_error_ui.cc b/chrome/browser/extensions/extension_error_ui.cc index 072f0c3..090931a 100644 --- a/chrome/browser/extensions/extension_error_ui.cc +++ b/chrome/browser/extensions/extension_error_ui.cc @@ -86,6 +86,7 @@ string16 ExtensionErrorUI::GetBubbleViewCancelButtonLabel() { } void ExtensionErrorUI::BubbleViewDidClose() { + // This call deletes ExtensionErrorUI object referenced by this. extension_service_->HandleExtensionAlertClosed(); } diff --git a/chrome/browser/extensions/extension_error_ui_default.cc b/chrome/browser/extensions/extension_error_ui_default.cc index bc0fd68..704454f 100644 --- a/chrome/browser/extensions/extension_error_ui_default.cc +++ b/chrome/browser/extensions/extension_error_ui_default.cc @@ -89,8 +89,9 @@ string16 ExtensionErrorUIDefault::ExtensionGlobalError:: void ExtensionErrorUIDefault::ExtensionGlobalError:: OnBubbleViewDidClose(Browser* browser) { + // This call deletes error_ui_ (and as a result of error_ui_ destruction, + // object pointed by this also gets deleted). error_ui_->BubbleViewDidClose(); - error_ui_->browser_ = NULL; } void ExtensionErrorUIDefault::ExtensionGlobalError:: |