summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiguelg@chromium.org <miguelg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-05 11:01:04 +0000
committermiguelg@chromium.org <miguelg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-05 11:01:04 +0000
commit89632bd2667c892706c38173f06d5ac54606be84 (patch)
treea46d4fc8a65f3440d6291ec928f3c1e324480668
parent4a23327d451274446261b18ded7b7f014176995e (diff)
downloadchromium_src-89632bd2667c892706c38173f06d5ac54606be84.zip
chromium_src-89632bd2667c892706c38173f06d5ac54606be84.tar.gz
chromium_src-89632bd2667c892706c38173f06d5ac54606be84.tar.bz2
Check that the infobar is owned before releasing it
BUG=328123 NOTRY=true Review URL: https://codereview.chromium.org/315973003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275061 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/android/infobars/infobar_android.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/ui/android/infobars/infobar_android.cc b/chrome/browser/ui/android/infobars/infobar_android.cc
index 544e6ee2..137eb74 100644
--- a/chrome/browser/ui/android/infobars/infobar_android.cc
+++ b/chrome/browser/ui/android/infobars/infobar_android.cc
@@ -50,6 +50,8 @@ void InfoBarAndroid::OnButtonClicked(JNIEnv* env,
}
void InfoBarAndroid::OnCloseButtonClicked(JNIEnv* env, jobject obj) {
+ if (!owner())
+ return; // We're closing; don't call anything, it might access the owner.
delegate()->InfoBarDismissed();
RemoveSelf();
}