diff options
| -rw-r--r-- | chrome/browser/automation/url_request_automation_job.cc | 7 | ||||
| -rw-r--r-- | chrome_frame/urlmon_url_request.cc | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc index 97522d2..f1a1f29 100644 --- a/chrome/browser/automation/url_request_automation_job.cc +++ b/chrome/browser/automation/url_request_automation_job.cc @@ -226,6 +226,13 @@ bool URLRequestAutomationJob::MayFilterMessage(const IPC::Message& message, } void URLRequestAutomationJob::OnMessage(const IPC::Message& message) { + if (!request_) { + NOTREACHED() << __FUNCTION__ + << ": Unexpected request received for job:" + << id(); + return; + } + IPC_BEGIN_MESSAGE_MAP(URLRequestAutomationJob, message) IPC_MESSAGE_HANDLER(AutomationMsg_RequestStarted, OnRequestStarted) IPC_MESSAGE_HANDLER(AutomationMsg_RequestData, OnDataAvailable) diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc index 5fabfb0..5bb78c2 100644 --- a/chrome_frame/urlmon_url_request.cc +++ b/chrome_frame/urlmon_url_request.cc @@ -481,6 +481,13 @@ STDMETHODIMP UrlmonUrlRequest::OnResponse(DWORD dwResponseCode, DCHECK(worker_thread_ != NULL); DCHECK_EQ(PlatformThread::CurrentId(), worker_thread_->thread_id()); + if (!binding_) { + DCHECK(redirect_url_.empty() == false); + DLOG(WARNING) << __FUNCTION__ + << ": Ignoring as the binding was aborted due to a redirect"; + return S_OK; + } + std::string raw_headers = WideToUTF8(response_headers); // Security check for frame busting headers. We don't honor the headers |