Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

script: in stream piping, ensure the heap is set only after it has been moved (#38385)

Browse source 
Setting a value on a `Heap` requires the heap to not be moved after the
call to `set`, the current code sets the value first, then moves it into
the `shutdown_error` refcell. It should be the other way around.

Testing: the core logic is covered by WPT tests, which should remain
unchanged.
 
Fixes: [38299](https://github.com/servo/servo/issues/38299)

---------

Signed-off-by: gterzian <2792687+gterzian@users.noreply.github.com>
This commit is contained in:
Gregory Terzian 2025-08-01 18:55:17 +08:00 • committed by GitHub
parent 625d636b04
commit 5ac9f40625
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

55
components/script/dom/readablestream.rs
View file

@ -192,14 +192,7 @@ impl PipeTo {
// will result in a rejection of the pipe promise, with this error. // will result in a rejection of the pipe promise, with this error.
// Unless any shutdown action raise their own error, // Unless any shutdown action raise their own error,
// in which case this error will be overwritten by the shutdown action error. // in which case this error will be overwritten by the shutdown action error.
{ self.set_shutdown_error(reason);
let mut error = Some(Heap::default());
// Setting the value on the heap after it has been moved.
if let Some(heap) = error.as_mut() {
heap.set(reason.get())
}
*self.shutdown_error.borrow_mut() = error;
}
// Let actions be an empty ordered set. // Let actions be an empty ordered set.
// Note: the actions are defined, and performed, inside `shutdown_with_an_action`. // Note: the actions are defined, and performed, inside `shutdown_with_an_action`.
@ -370,14 +363,7 @@ impl Callback for PipeTo {
// If `result` isn't undefined or array-like, // If `result` isn't undefined or array-like,
// then it is an error // then it is an error
// and should overwrite the current shutdown error. // and should overwrite the current shutdown error.
{ self.set_shutdown_error(result);
let mut error = Some(Heap::default());
// Setting the value on the heap after it has been moved.
if let Some(heap) = error.as_mut() {
heap.set(result.get())
}
*self.shutdown_error.borrow_mut() = error;
}
} }
self.finalize(cx, &global, can_gc); self.finalize(cx, &global, can_gc);
}, },
@ -387,6 +373,16 @@ impl Callback for PipeTo {
} }
impl PipeTo { impl PipeTo {
/// Setting shutdown error in a way that ensures it isn't
/// moved after it has been set.
fn set_shutdown_error(&self, error: SafeHandleValue) {
*self.shutdown_error.borrow_mut() = Some(Heap::default());
let Some(ref heap) = *self.shutdown_error.borrow() else {
unreachable!("Option set to Some(heap) above.");
};
heap.set(error.get())
}
/// Wait for the writer to be ready, /// Wait for the writer to be ready,
/// which implements the constraint that backpressure must be enforced. /// which implements the constraint that backpressure must be enforced.
fn wait_for_writer_ready(&self, global: &GlobalScope, realm: InRealm, can_gc: CanGc) { fn wait_for_writer_ready(&self, global: &GlobalScope, realm: InRealm, can_gc: CanGc) {
@ -502,14 +498,7 @@ impl PipeTo {
if source.is_errored() { if source.is_errored() {
rooted!(in(*cx) let mut source_error = UndefinedValue()); rooted!(in(*cx) let mut source_error = UndefinedValue());
source.get_stored_error(source_error.handle_mut()); source.get_stored_error(source_error.handle_mut());
{ self.set_shutdown_error(source_error.handle());
let mut error = Some(Heap::default());
// Setting the value on the heap after it has been moved.
if let Some(heap) = error.as_mut() {
heap.set(source_error.get())
}
*self.shutdown_error.borrow_mut() = error;
}
// If preventAbort is false, // If preventAbort is false,
if !self.prevent_abort { if !self.prevent_abort {
@ -552,14 +541,7 @@ impl PipeTo {
if dest.is_errored() { if dest.is_errored() {
rooted!(in(*cx) let mut dest_error = UndefinedValue()); rooted!(in(*cx) let mut dest_error = UndefinedValue());
dest.get_stored_error(dest_error.handle_mut()); dest.get_stored_error(dest_error.handle_mut());
{ self.set_shutdown_error(dest_error.handle());
let mut error = Some(Heap::default());
// Setting the value on the heap after it has been moved.
if let Some(heap) = error.as_mut() {
heap.set(dest_error.get())
}
*self.shutdown_error.borrow_mut() = error;
}
// If preventCancel is false, // If preventCancel is false,
if !self.prevent_cancel { if !self.prevent_cancel {
@ -648,14 +630,7 @@ impl PipeTo {
let error = let error =
Error::Type("Destination is closed or has closed queued or in flight".to_string()); Error::Type("Destination is closed or has closed queued or in flight".to_string());
error.to_jsval(cx, global, dest_closed.handle_mut(), can_gc); error.to_jsval(cx, global, dest_closed.handle_mut(), can_gc);
{ self.set_shutdown_error(dest_closed.handle());
let mut error = Some(Heap::default());
// Setting the value on the heap after it has been moved.
if let Some(heap) = error.as_mut() {
heap.set(dest_closed.get())
}
*self.shutdown_error.borrow_mut() = error;
}
// If preventCancel is false, // If preventCancel is false,
if !self.prevent_cancel { if !self.prevent_cancel {