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 952840 - Remove scope from XPCWN::FindTearOff. r=bholley

Browse Source
This commit is contained in:
Andrew McCreight 2014-01-06 17:35:54 -08:00
parent 01f8bc9e65
commit 022e4a0e0b
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/xpconnect/src/XPCWrappedNative.cpp
View File

@ -1513,17 +1513,14 @@ XPCWrappedNative::FindTearOff(XPCNativeInterface* aInterface,
to = newChunk->mTearOffs;
}
{
// Scope keeps |tearoff| from leaking across the rest of the function.
AutoMarkingWrappedNativeTearOffPtr tearoff(cx, to);
rv = InitTearOff(to, aInterface, needJSObject);
// During shutdown, we don't sweep tearoffs. So make sure to unmark
// manually in case the auto-marker marked us. We shouldn't ever be
// getting here _during_ our Mark/Sweep cycle, so this should be safe.
to->Unmark();
if (NS_FAILED(rv))
to = nullptr;
}
AutoMarkingWrappedNativeTearOffPtr tearoff(cx, to);
rv = InitTearOff(to, aInterface, needJSObject);
// During shutdown, we don't sweep tearoffs. So make sure to unmark
// manually in case the auto-marker marked us. We shouldn't ever be
// getting here _during_ our Mark/Sweep cycle, so this should be safe.
to->Unmark();
if (NS_FAILED(rv))
to = nullptr;
if (pError)
*pError = rv;