summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-07 18:54:19 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-07 18:54:19 +0000
commit89e2ac5d5bde096f96c92c21d356a7ec2d3435a7 (patch)
treea9a66fb17f94ad44bbdbe5cea61852a094030f86 /content
parent06ea34a6130ef05346cb214da7d5f6d174a2bfb7 (diff)
downloadchromium_src-89e2ac5d5bde096f96c92c21d356a7ec2d3435a7.zip
chromium_src-89e2ac5d5bde096f96c92c21d356a7ec2d3435a7.tar.gz
chromium_src-89e2ac5d5bde096f96c92c21d356a7ec2d3435a7.tar.bz2
Prevent a use-after-free by explicitly destroying a TCVA's window before the TCVA (the window's delegate) is completely destroyed.
http://crbug.com/122610 TEST=none Review URL: https://chromiumcodereview.appspot.com/10031004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/web_contents/web_contents_view_aura.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index d525cdf..cbf9ec2 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -174,6 +174,9 @@ WebContentsViewAura::WebContentsViewAura(
}
WebContentsViewAura::~WebContentsViewAura() {
+ // Window needs a valid delegate during its destructor, so we explicitly
+ // delete it here.
+ window_.reset();
}
////////////////////////////////////////////////////////////////////////////////