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

Merge pull request #5770 from electron/clear-before-notice

Browse source 
Clear the buffers before notifying the other end of the pipe
This commit is contained in:
Cheng Zhao 2016-05-30 22:52:01 +00:00
commit 543d4bb2b1
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -183,8 +183,8 @@ int URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer,
// Write data to the pending buffer and clear them after the writing. // Write data to the pending buffer and clear them after the writing.
int bytes_read = BufferCopy(buffer, num_bytes, int bytes_read = BufferCopy(buffer, num_bytes,
pending_buffer_.get(), pending_buffer_size_); pending_buffer_.get(), pending_buffer_size_);
ReadRawDataComplete(bytes_read);
ClearPendingBuffer(); ClearPendingBuffer();
ReadRawDataComplete(bytes_read);
return bytes_read; return bytes_read;
} }
@ -210,8 +210,9 @@ int URLRequestFetchJob::ReadRawData(net::IOBuffer* dest, int dest_size) {
// Read from the write buffer and clear them after reading. // Read from the write buffer and clear them after reading.
int bytes_read = BufferCopy(write_buffer_.get(), write_num_bytes_, int bytes_read = BufferCopy(write_buffer_.get(), write_num_bytes_,
dest, dest_size); dest, dest_size);
write_callback_.Run(bytes_read); net::CompletionCallback write_callback = write_callback_;
ClearWriteBuffer(); ClearWriteBuffer();
write_callback.Run(bytes_read);
return bytes_read; return bytes_read;
} }