diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 22:04:22 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 22:04:22 +0000 |
| commit | b0a7fc6cc478e4f9d71edfa166744320340c8109 (patch) | |
| tree | 59922c3d40ae1f1e8a06210668fb6ac3a8cede27 /chrome/browser/automation | |
| parent | 5443a1130103a6e3d3b60fb48d11efe04d44a119 (diff) | |
| download | chromium_src-b0a7fc6cc478e4f9d71edfa166744320340c8109.zip chromium_src-b0a7fc6cc478e4f9d71edfa166744320340c8109.tar.gz chromium_src-b0a7fc6cc478e4f9d71edfa166744320340c8109.tar.bz2 | |
There are instances where the URLRequestAutomationJob::Kill() function can get called after Cleanup, which
results in the AutomationResourceMessageFilter member getting destroyed and a subsequent crash.
Added a NULL check for the same.
Review URL: http://codereview.chromium.org/160293
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
| -rw-r--r-- | chrome/browser/automation/url_request_automation_job.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc index 5d4cac6..6bd18a4 100644 --- a/chrome/browser/automation/url_request_automation_job.cc +++ b/chrome/browser/automation/url_request_automation_job.cc @@ -93,8 +93,10 @@ void URLRequestAutomationJob::Start() { } void URLRequestAutomationJob::Kill() { - message_filter_->Send(new AutomationMsg_RequestEnd(0, tab_, id_, - URLRequestStatus(URLRequestStatus::CANCELED, 0))); + if (message_filter_.get()) { + message_filter_->Send(new AutomationMsg_RequestEnd(0, tab_, id_, + URLRequestStatus(URLRequestStatus::CANCELED, 0))); + } DisconnectFromMessageFilter(); URLRequestJob::Kill(); } |