mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Clear pending_buffer_ at correct time

Browse source
This commit is contained in:
Cheng Zhao 2015-06-17 11:04:15 +08:00
parent 274854876c
commit 66c4c7e77b
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/net/url_request_fetch_job.cc
View file

@ -104,6 +104,12 @@ int URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer, int num_bytes) {
int bytes_read = std::min(num_bytes, pending_buffer_size_); int bytes_read = std::min(num_bytes, pending_buffer_size_);
memcpy(pending_buffer_->data(), buffer->data(), bytes_read); memcpy(pending_buffer_->data(), buffer->data(), bytes_read);
// Clear the buffers before notifying the read is complete, so that it is
// safe for the observer to read.
pending_buffer_ = nullptr;
pending_buffer_size_ = 0;
NotifyReadComplete(bytes_read); NotifyReadComplete(bytes_read);
return bytes_read; return bytes_read;
} }
@ -146,6 +152,8 @@ int URLRequestFetchJob::GetResponseCode() const {
} }
void URLRequestFetchJob::OnURLFetchComplete(const net::URLFetcher* source) { void URLRequestFetchJob::OnURLFetchComplete(const net::URLFetcher* source) {
pending_buffer_ = nullptr;
pending_buffer_size_ = 0;
NotifyDone(fetcher_->GetStatus()); NotifyDone(fetcher_->GetStatus());
if (fetcher_->GetStatus().is_success()) if (fetcher_->GetStatus().is_success())
NotifyReadComplete(0); NotifyReadComplete(0);