diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-06 23:33:58 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-06 23:33:58 +0000 |
| commit | 9ec487540a5ef0e454ef5710f9b555aa72f10765 (patch) | |
| tree | 01db9dc2f5493e04c7278d33ecb70f8d94a29782 | |
| parent | 7f6bc5f97927363355dec786bb9a02cf54328a0e (diff) | |
| download | chromium_src-9ec487540a5ef0e454ef5710f9b555aa72f10765.zip chromium_src-9ec487540a5ef0e454ef5710f9b555aa72f10765.tar.gz chromium_src-9ec487540a5ef0e454ef5710f9b555aa72f10765.tar.bz2 | |
Add a null pointer check for transaction_ in
ContinueDespiteLastError. The URL request job may have
been cancelled but not yet deleted.
R=eroman,jcampan
BUG=6423
Review URL: http://codereview.chromium.org/20146
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9358 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/url_request/url_request_http_job.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index 166d82e..6a3535b 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -329,7 +329,10 @@ void URLRequestHttpJob::CancelAuth() { } void URLRequestHttpJob::ContinueDespiteLastError() { - DCHECK(transaction_.get()); + // If the transaction was destroyed, then the job was cancelled. + if (!transaction_.get()) + return; + DCHECK(!response_info_) << "should not have a response yet"; // No matter what, we want to report our status as IO pending since we will |