wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1057601 - Use UncheckedUnwrap in CPOW code (r=mrbkap)

Browse Source
This commit is contained in:
Bill McCloskey 2014-08-22 18:18:00 -07:00
parent 05d66e27b1
commit 4a74bda656
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/ipc/WrapperOwner.cpp
View File

@ -679,7 +679,7 @@ IsCPOW(JSObject *obj)
bool bool
IsWrappedCPOW(JSObject *obj) IsWrappedCPOW(JSObject *obj)
{ {
JSObject *unwrapped = js::CheckedUnwrap(obj, true); JSObject *unwrapped = js::UncheckedUnwrap(obj, true);
if (!unwrapped) if (!unwrapped)
return false; return false;
return IsCPOW(unwrapped); return IsCPOW(unwrapped);
@ -775,7 +775,7 @@ WrapperOwner::toObjectVariant(JSContext *cx, JSObject *objArg, ObjectVariant *ob
// wrappers, then the wrapper might be GCed while the target remained alive. // wrappers, then the wrapper might be GCed while the target remained alive.
// Whenever operating on an object that comes from the table, we wrap it // Whenever operating on an object that comes from the table, we wrap it
// in findObjectById. // in findObjectById.
obj = js::CheckedUnwrap(obj, false); obj = js::UncheckedUnwrap(obj, false);
if (obj && IsCPOW(obj) && OwnerOf(obj) == this) { if (obj && IsCPOW(obj) && OwnerOf(obj) == this) {
*objVarp = LocalObject(idOf(obj)); *objVarp = LocalObject(idOf(obj));
return true; return true;