diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 17:33:54 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 17:33:54 +0000 |
| commit | a7c5df004a268a603a2d781aade74a7e5881e4d4 (patch) | |
| tree | 71339add0e4ffcfdf990c869d6216073194d6a4a | |
| parent | 3002f55e44a6d87e8d2e32c9ac34bb09ba514580 (diff) | |
| download | chromium_src-a7c5df004a268a603a2d781aade74a7e5881e4d4.zip chromium_src-a7c5df004a268a603a2d781aade74a7e5881e4d4.tar.gz chromium_src-a7c5df004a268a603a2d781aade74a7e5881e4d4.tar.bz2 | |
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
| -rw-r--r-- | content/browser/renderer_host/render_view_host_observer.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |