Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-10-05 19:19:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't clobber the default wrapping callback.

Browse source
This commit is contained in:
Ms2ger 2014-05-06 12:37:13 +02:00
parent 8ea3cbf18a
commit 1fa3610e2d
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/script/script_task.rs
View file

@ -616,8 +616,16 @@ impl ScriptTask {
ptr.is_not_null()
});
unsafe {
// JS_SetWrapObjectCallbacks clobbers the existing wrap callback,
// and JSCompartment::wrap crashes if that happens. The only way
// to retrieve the default callback is as the result of
// JS_SetWrapObjectCallbacks, which is why we call it twice.
let callback = JS_SetWrapObjectCallbacks((*js_runtime).ptr,
ptr::null(),
wrap_for_same_compartment,
ptr::null());
JS_SetWrapObjectCallbacks((*js_runtime).ptr,
ptr::null(),
callback,
wrap_for_same_compartment,
ptr::null());
}