diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-11 18:02:27 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-11 18:02:27 +0000 |
| commit | a801cb3dc18e88757feb246e94e86594be2f276c (patch) | |
| tree | cad6f3e3ba85cf525ac917ad5eadff0e74a35f14 /chrome/browser/memory_details.cc | |
| parent | f1346bdc43f7e5a2a54809c81b62691ecf29eb36 (diff) | |
| download | chromium_src-a801cb3dc18e88757feb246e94e86594be2f276c.zip chromium_src-a801cb3dc18e88757feb246e94e86594be2f276c.tar.gz chromium_src-a801cb3dc18e88757feb246e94e86594be2f276c.tar.bz2 | |
content: Introduce a RenderWidgetHostIterator.
RenderWidgetHost::GetRenderWidgetHosts() and GetAllRenderWidgetHosts() returns a
list of RenderWidgetHost's. The caller can then perform some operation that leads
to some of the RenderWidgetHosts in the list being destroyed, leading to reading
from freed memory, when iterating over the list. So instead of sending a list,
introduce RenderWidgetHostIterator, which allows safely iterating over the list
of hosts.
BUG=285307
R=ajwong@chromium.org, creis@chromium.org, jam@chromium.org
Review URL: https://codereview.chromium.org/23453038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/memory_details.cc')
| -rw-r--r-- | chrome/browser/memory_details.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index 643e211..3e24154 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -23,6 +23,7 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" +#include "content/public/browser/render_widget_host_iterator.h" #include "content/public/browser/web_contents.h" #include "content/public/common/bindings_policy.h" #include "extensions/browser/view_type_utils.h" @@ -218,10 +219,11 @@ void MemoryDetails::CollectChildInfoOnUIThread() { ProcessMemoryInformation& process = chrome_browser->processes[index]; - RenderWidgetHost::List widgets = RenderWidgetHost::GetRenderWidgetHosts(); - for (size_t i = 0; i < widgets.size(); ++i) { + scoped_ptr<content::RenderWidgetHostIterator> widgets( + RenderWidgetHost::GetRenderWidgetHosts()); + while (content::RenderWidgetHost* widget = widgets->GetNextHost()) { content::RenderProcessHost* render_process_host = - widgets[i]->GetProcess(); + widget->GetProcess(); DCHECK(render_process_host); // Ignore processes that don't have a connection, such as crashed tabs. if (!render_process_host->HasConnection() || @@ -241,10 +243,10 @@ void MemoryDetails::CollectChildInfoOnUIThread() { // The RenderProcessHost may host multiple WebContentses. Any // of them which contain diagnostics information make the whole // process be considered a diagnostics process. - if (!widgets[i]->IsRenderView()) + if (!widget->IsRenderView()) continue; - RenderViewHost* host = RenderViewHost::From(widgets[i]); + RenderViewHost* host = RenderViewHost::From(widget); WebContents* contents = WebContents::FromRenderViewHost(host); GURL url; if (contents) { |