Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2185)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java

Issue 1750463002: Fix use-after-free in Android Origin Info Bubble (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
index e1d39ceac5077d954e60f02715d9aa8ab94b0e2d..99412beed593f0da9a018a8eaa933cc5e3e35ac1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
@@ -229,7 +229,7 @@ public class WebsiteSettingsPopup implements OnClickListener {
private final WindowAndroid mWindowAndroid;
// A pointer to the C++ object for this UI.
- private final long mNativeWebsiteSettingsPopup;
+ private long mNativeWebsiteSettingsPopup;
// The outer container, filled with the layout from website_settings.xml.
private final LinearLayout mContainer;
@@ -397,6 +397,7 @@ public class WebsiteSettingsPopup implements OnClickListener {
assert mNativeWebsiteSettingsPopup != 0;
webContentsObserver.destroy();
nativeDestroy(mNativeWebsiteSettingsPopup);
+ mNativeWebsiteSettingsPopup = 0;
}
});
@@ -875,7 +876,9 @@ public class WebsiteSettingsPopup implements OnClickListener {
}
private void recordAction(int action) {
- nativeRecordWebsiteSettingsAction(mNativeWebsiteSettingsPopup, action);
+ if (mNativeWebsiteSettingsPopup != 0) {
+ nativeRecordWebsiteSettingsAction(mNativeWebsiteSettingsPopup, action);
+ }
}
/**
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698