From a7c5df004a268a603a2d781aade74a7e5881e4d4 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Fri, 8 Apr 2011 17:33:54 +0000 Subject: Revert 80946 - Fix heap corruption that occurs when RenderViewHostObserver calls RenderViewHost to unregister when the latter is in its destructor.TBR=dmichaelReview URL: http://codereview.chromium.org/6813043 TBR=jam@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80953 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/renderer_host/render_view_host_observer.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/browser/renderer_host/render_view_host_observer.cc b/content/browser/renderer_host/render_view_host_observer.cc index 4319855..e60e2bb 100644 --- a/content/browser/renderer_host/render_view_host_observer.cc +++ b/content/browser/renderer_host/render_view_host_observer.cc @@ -35,6 +35,7 @@ bool RenderViewHostObserver::Send(IPC::Message* message) { } void RenderViewHostObserver::RenderViewHostDestruction() { - render_view_host_ = NULL; + render_view_host_->RemoveObserver(this); RenderViewHostDestroyed(); + render_view_host_ = NULL; } -- cgit v1.1