Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 18:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

beard@netscape.com: nsXBLBinding objects are getting released without ever removing their roots. That

Browse Source 
is clear.  r=dougt and r=hyatt. Fix for 34130.
This commit is contained in:
dougt%netscape.com 2000-04-03 06:31:32 +00:00
parent 8148445ae0
commit 3229a90597
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
content/xbl/src/nsXBLBinding.cpp
View File

@ -47,6 +47,7 @@
#include "nsSupportsArray.h"
#include "nsINameSpace.h"
#include "nsJSUtils.h"
#include "nsIJSRuntimeService.h"
// Event listeners
#include "nsIEventListenerManager.h"
@ -332,10 +333,32 @@ nsXBLBinding::nsXBLBinding(void)
}
}
/**
* Removes a root inadvertently left over.
* This is really an error condition, but I've written
* this to prevent the JS GC from asserting.
*/
static nsresult removeRoot(void* aSlot)
{
const char kJSRuntimeServiceProgID[] = "nsJSRuntimeService";
nsresult rv;
NS_WITH_SERVICE(nsIJSRuntimeService, runtimeService, kJSRuntimeServiceProgID, &rv);
if (NS_FAILED(rv)) return rv;
JSRuntime* rt;
rv = runtimeService->GetRuntime(&rt);
if (NS_FAILED(rv)) return rv;
return (JS_RemoveRootRT(rt, aSlot) ? NS_OK : NS_ERROR_FAILURE);
}
nsXBLBinding::~nsXBLBinding(void)
{
NS_ASSERTION(!mScriptObject, "XBL binding hasn't properly cleared its script object out.");
if (mScriptObject) {
removeRoot(&mScriptObject);
mScriptObject = nsnull;
}
delete mAttributeTable;
gRefCnt--;

25
layout/xbl/src/nsXBLBinding.cpp
View File

@ -47,6 +47,7 @@
#include "nsSupportsArray.h"
#include "nsINameSpace.h"
#include "nsJSUtils.h"
#include "nsIJSRuntimeService.h"
// Event listeners
#include "nsIEventListenerManager.h"
@ -332,10 +333,32 @@ nsXBLBinding::nsXBLBinding(void)
}
}
/**
* Removes a root inadvertently left over.
* This is really an error condition, but I've written
* this to prevent the JS GC from asserting.
*/
static nsresult removeRoot(void* aSlot)
{
const char kJSRuntimeServiceProgID[] = "nsJSRuntimeService";
nsresult rv;
NS_WITH_SERVICE(nsIJSRuntimeService, runtimeService, kJSRuntimeServiceProgID, &rv);
if (NS_FAILED(rv)) return rv;
JSRuntime* rt;
rv = runtimeService->GetRuntime(&rt);
if (NS_FAILED(rv)) return rv;
return (JS_RemoveRootRT(rt, aSlot) ? NS_OK : NS_ERROR_FAILURE);
}
nsXBLBinding::~nsXBLBinding(void)
{
NS_ASSERTION(!mScriptObject, "XBL binding hasn't properly cleared its script object out.");
if (mScriptObject) {
removeRoot(&mScriptObject);
mScriptObject = nsnull;
}
delete mAttributeTable;
gRefCnt--;