Skip to content

Fix get/set_embedder_data to create annex and offset by internal slot count #1868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix get/set_embedder_data to create annex and offset by internal slot count #1868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fdf040
Fix get/set_embedder_data to create annex and offset by internal slot…
coolreader18 Oct 28, 2025
9f18f5e
Clear slots before calling set_default_context
coolreader18 Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,15 @@ impl Context {
/// Note that index 0 currently has a special meaning for Chrome's debugger.
#[inline(always)]
pub fn set_embedder_data(&self, slot: i32, data: Local<'_, Value>) {
// Initialize the annex when slot count > INTERNAL_SLOT_COUNT.
self.get_annex_mut(true);

unsafe {
v8__Context__SetEmbedderData(self, slot, &*data);
v8__Context__SetEmbedderData(
self,
slot + Self::INTERNAL_SLOT_COUNT,
&*data,
);
}
}

Expand All @@ -329,7 +336,11 @@ impl Context {
scope: &PinScope<'s, '_, ()>,
slot: i32,
) -> Option<Local<'s, Value>> {
unsafe { scope.cast_local(|_| v8__Context__GetEmbedderData(self, slot)) }
unsafe {
scope.cast_local(|_| {
v8__Context__GetEmbedderData(self, slot + Self::INTERNAL_SLOT_COUNT)
})
}
}

#[inline(always)]
Expand Down
2 changes: 2 additions & 0 deletions tests/test_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5739,6 +5739,7 @@ fn snapshot_creator_context_embedder_data() {
let one_val = v8::Number::new(scope, 1.0).into();
assert!(prop.same_value(one_val));
}
context.clear_all_slots();
scope.set_default_context(context);
}

Expand Down Expand Up @@ -5772,6 +5773,7 @@ fn snapshot_creator_context_embedder_data() {
let value = context.get_embedder_data(scope, 2).unwrap();
assert!(value.same_value(x));
}
context.clear_all_slots();
scope.set_default_context(context);
}
snapshot_creator
Expand Down
Loading