wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-02 05:17:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Harden stream pipe cancellation

Browse source
This commit is contained in:
Basilisk-Dev 2026-05-08 15:07:37 -04:00 • committed by wuggy
commit 936a862591
1 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
js/src/builtin/Stream.cpp
View file

@ -6032,6 +6032,8 @@ js::InitStreamExtras(JSContext* cx, HandleObject global)
var write = state.sink.write; var write = state.sink.write;
var controller = state.controller; var controller = state.controller;
var writePromise = state.writeChain.then(function() { var writePromise = state.writeChain.then(function() {
if (state.state === "errored")
throw state.storedError;
if (write) if (write)
return write.call(state.sink, chunk, controller); return write.call(state.sink, chunk, controller);
return undefined; return undefined;
@ -6103,6 +6105,8 @@ js::InitStreamExtras(JSContext* cx, HandleObject global)
state.closed.reject(reason); state.closed.reject(reason);
state.readyPromise.catch(function() {}); state.readyPromise.catch(function() {});
state.closedPromise.catch(function() {}); state.closedPromise.catch(function() {});
if (state.writer)
syncWritableWriterWithStream(state.writer, state);
var abortPromise = abort ? promiseCall(abort, state.sink, [reason]) var abortPromise = abort ? promiseCall(abort, state.sink, [reason])
: Promise.resolve(undefined); : Promise.resolve(undefined);
@ -6542,7 +6546,11 @@ js::InitStreamExtras(JSContext* cx, HandleObject global)
signal.addEventListener("abort", onAbort); signal.addEventListener("abort", onAbort);
function pump() { function pump() {
if (closed)
return;
reader.read().then(function(result) { reader.read().then(function(result) {
if (closed)
return;
if (result.done) { if (result.done) {
var closePromise = preventClose ? Promise.resolve(undefined) var closePromise = preventClose ? Promise.resolve(undefined)
: writer.close(); : writer.close();
@ -6557,6 +6565,8 @@ js::InitStreamExtras(JSContext* cx, HandleObject global)
} }
writer.write(result.value).then(pump, function(error) { writer.write(result.value).then(pump, function(error) {
if (closed)
return;
var cancel = preventCancel var cancel = preventCancel
? Promise.resolve(undefined) ? Promise.resolve(undefined)
: reader.cancel(error); : reader.cancel(error);
@ -6569,6 +6579,8 @@ js::InitStreamExtras(JSContext* cx, HandleObject global)
}); });
}); });
}, function(error) { }, function(error) {
if (closed)
return;
var abort = preventAbort var abort = preventAbort
? Promise.resolve(undefined) ? Promise.resolve(undefined)
: writer.abort(error); : writer.abort(error);
@ -6596,6 +6608,8 @@ js::InitStreamExtras(JSContext* cx, HandleObject global)
throw new TypeError("ReadableStream is locked"); throw new TypeError("ReadableStream is locked");
if (!isWritableStream(writable)) if (!isWritableStream(writable))
throw new TypeError("transform.writable must be a WritableStream"); throw new TypeError("transform.writable must be a WritableStream");
if (!(output instanceof global.ReadableStream))
throw new TypeError("transform.readable must be a ReadableStream");
if (writable.locked) if (writable.locked)
throw new TypeError("WritableStream is locked"); throw new TypeError("WritableStream is locked");
readable.pipeTo(writable, options).catch(function() {}); readable.pipeTo(writable, options).catch(function() {});
@ -6679,6 +6693,9 @@ js::InitStreamExtras(JSContext* cx, HandleObject global)
return reader.cancel(value).then(function() { return reader.cancel(value).then(function() {
reader.releaseLock(); reader.releaseLock();
return { value: value, done: true }; return { value: value, done: true };
}, function(error) {
try { reader.releaseLock(); } catch (e) {}
throw error;
}); });
}; };