fix: don't call ReadRawDataComplete if it's not necessary (electron#15185)

brenca · codebytere · commit 4d085c4aaeb7 · 2018-10-16T21:57:26.000-07:00
diff --git a/atom/browser/net/url_request_stream_job.cc b/atom/browser/net/url_request_stream_job.cc
@@ -153,13 +153,17 @@ void URLRequestStreamJob::OnData(std::vector<char>&& buffer) {  // NOLINT
   if (pending_buf_) {
     int len = BufferCopy(&write_buffer_, pending_buf_.get(), pending_buf_size_);
     write_buffer_.erase(write_buffer_.begin(), write_buffer_.begin() + len);
+    pending_buf_ = nullptr;
+    pending_buf_size_ = 0;
     ReadRawDataComplete(len);
   }
 }
 
 void URLRequestStreamJob::OnEnd() {
   ended_ = true;
-  ReadRawDataComplete(0);
+  if (pending_buf_) {
+    ReadRawDataComplete(0);
+  }
 }
 
 void URLRequestStreamJob::OnError(int error) {

Original file line number	Diff line number	Diff line change
`@@ -153,13 +153,17 @@ void URLRequestStreamJob::OnData(std::vector<char>&& buffer) { // NOLINT`
`153`	`153`	`if (pending_buf_) {`
`154`	`154`	`int len = BufferCopy(&write_buffer_, pending_buf_.get(), pending_buf_size_);`
`155`	`155`	`write_buffer_.erase(write_buffer_.begin(), write_buffer_.begin() + len);`
	`156`	`+ pending_buf_ = nullptr;`
	`157`	`+ pending_buf_size_ = 0;`
`156`	`158`	`ReadRawDataComplete(len);`
`157`	`159`	`}`
`158`	`160`	`}`
`159`	`161`
`160`	`162`	`void URLRequestStreamJob::OnEnd() {`
`161`	`163`	`ended_ = true;`
`162`		`- ReadRawDataComplete(0);`
	`164`	`+ if (pending_buf_) {`
	`165`	`+ ReadRawDataComplete(0);`
	`166`	`+ }`
`163`	`167`	`}`
`164`	`168`
`165`	`169`	`void URLRequestStreamJob::OnError(int error) {`