diff options
| author | qfel@google.com <qfel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 10:19:35 +0000 |
|---|---|---|
| committer | qfel@google.com <qfel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 10:19:35 +0000 |
| commit | 55561f30f7a0e183fd9b7d183b153613266cd83b (patch) | |
| tree | 3cdbbbde2c936fa06dcbd79a53a94fb2083c1c89 | |
| parent | 5a96ecfcc8368dc6e2b1b5717e5ec968d102bbec (diff) | |
| download | chromium_src-55561f30f7a0e183fd9b7d183b153613266cd83b.zip chromium_src-55561f30f7a0e183fd9b7d183b153613266cd83b.tar.gz chromium_src-55561f30f7a0e183fd9b7d183b153613266cd83b.tar.bz2 | |
Fixed segmentation fault in ExtensionErrorUIDefault::ExtensionGlobalError::OnBubbleViewDidClose
BUG=142336
Review URL: https://chromiumcodereview.appspot.com/10832273
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151451 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:: |