summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 23:13:12 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 23:13:12 +0000
commitd9bc603a6d1df252bdecff3ff4a5fde575459e1e (patch)
treea71e3672b993184c76cc3e90872642a051b988e1 /chrome/browser/automation
parent2b07c93fb667131d6e6d7550b76a8da74f8a02a4 (diff)
downloadchromium_src-d9bc603a6d1df252bdecff3ff4a5fde575459e1e.zip
chromium_src-d9bc603a6d1df252bdecff3ff4a5fde575459e1e.tar.gz
chromium_src-d9bc603a6d1df252bdecff3ff4a5fde575459e1e.tar.bz2
Fixes a crash seen on chrome frame reliability test runs. We need to validate the iterator from the render view map
in the SetCookies IPC as well as the render view could be in the process of being deleted Fixes bug http://code.google.com/p/chromium/issues/detail?id=50966 Bug=50966 TBR=amit Review URL: http://codereview.chromium.org/3050030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r--chrome/browser/automation/automation_resource_message_filter.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/automation/automation_resource_message_filter.cc b/chrome/browser/automation/automation_resource_message_filter.cc
index 1529751..b570152 100644
--- a/chrome/browser/automation/automation_resource_message_filter.cc
+++ b/chrome/browser/automation/automation_resource_message_filter.cc
@@ -420,11 +420,13 @@ void AutomationResourceMessageFilter::SetCookiesForUrl(
set_cookies_callback->render_process_id(),
set_cookies_callback->render_view_id())));
- DCHECK(automation_details_iter->second.filter != NULL);
+ if (automation_details_iter != filtered_render_views_.Get().end()) {
+ DCHECK(automation_details_iter->second.filter != NULL);
- if (automation_details_iter->second.filter) {
- automation_details_iter->second.filter->Send(
- new AutomationMsg_SetCookieAsync(0, tab_handle, url, cookie_line));
+ if (automation_details_iter->second.filter) {
+ automation_details_iter->second.filter->Send(
+ new AutomationMsg_SetCookieAsync(0, tab_handle, url, cookie_line));
+ }
}
}