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

fix: correctly handle nexttick scheduling in stream reads (#24022)

Browse source
This commit is contained in:
Paul Frazee 2020-06-11 11:55:59 -05:00 • committed by GitHub
parent 130b176796
commit 81d09bea44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shell/browser/net/node_stream_loader.cc
View file

@ -68,6 +68,8 @@ void NodeStreamLoader::Start(network::mojom::URLResponseHeadPtr head) {
void NodeStreamLoader::NotifyReadable() {
if (!readable_)
ReadMore();
else if (is_reading_)
has_read_waiting_ = true;
readable_ = true;
}
@ -101,8 +103,16 @@ void NodeStreamLoader::ReadMore() {
// If there is no buffer read, wait until |readable| is emitted again.
v8::Local<v8::Value> buffer;
if (!ret.ToLocal(&buffer) || !node::Buffer::HasInstance(buffer)) {
readable_ = false;
is_reading_ = false;
// If 'readable' was called after 'read()', try again
if (has_read_waiting_) {
has_read_waiting_ = false;
ReadMore();
return;
}
readable_ = false;
if (ended_) {
NotifyComplete(result_);
}