mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-16 20:20:51 +01:00
libcef:
- Fix possible dereference of empty request_ value in RequestProxy. (Issue #70) git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@68 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
parent
0540f32f24
commit
431fc0ac73
@ -319,7 +319,8 @@ class RequestProxy : public URLRequest::Delegate,
|
||||
if (!resource_stream_.get() && !request_.get())
|
||||
return;
|
||||
|
||||
request_->Cancel();
|
||||
if (request_.get())
|
||||
request_->Cancel();
|
||||
Done();
|
||||
}
|
||||
|
||||
@ -441,13 +442,12 @@ class RequestProxy : public URLRequest::Delegate,
|
||||
OnCompletedRequest(URLRequestStatus(URLRequestStatus::SUCCESS, 0),
|
||||
std::string());
|
||||
resource_stream_ = NULL;
|
||||
} else {
|
||||
} else if(request_.get()) {
|
||||
if (upload_progress_timer_.IsRunning()) {
|
||||
MaybeUpdateUploadProgress();
|
||||
upload_progress_timer_.Stop();
|
||||
}
|
||||
|
||||
DCHECK(request_.get());
|
||||
OnCompletedRequest(request_->status(), std::string());
|
||||
request_.reset(); // destroy on the io thread
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user