Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix incorrect use of nsSupportsHashTable that was causing leakage.

Browse Source
This commit is contained in:
waterson%netscape.com 1999-11-23 22:02:57 +00:00
parent 4e939113b6
commit 8662873fc9
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
chrome/src/nsChromeRegistry.cpp
View File

@ -478,12 +478,10 @@ NS_IMETHODIMP nsChromeRegistry::GetOverlayDataSource(nsIURI *aChromeURL, nsIRDFD
overlayFile += "overlays.rdf";
nsStringKey skey(overlayFile);
void *data = mDataSourceTable->Get(&skey);
if (data)
nsCOMPtr<nsISupports> supports = getter_AddRefs(NS_STATIC_CAST(nsISupports*, mDataSourceTable->Get(&skey)));
if (supports)
{
nsCOMPtr<nsIRDFDataSource> dataSource;
nsISupports *supports = NS_STATIC_CAST(nsISupports*, data);
dataSource = do_QueryInterface(supports, &rv);
nsCOMPtr<nsIRDFDataSource> dataSource = do_QueryInterface(supports, &rv);
if (NS_SUCCEEDED(rv))
{
*aResult = dataSource;
@ -600,13 +598,10 @@ nsChromeRegistry::InitializeDataSource(nsString &aPackage,
{
// current.rdf and overlays.rdf are loaded in pairs and so if one is loaded, the other should be too.
nsStringKey skey(chromeFile);
void *data = mDataSourceTable->Get(&skey);
if (data)
nsCOMPtr<nsISupports> supports = getter_AddRefs(NS_STATIC_CAST(nsISupports*, mDataSourceTable->Get(&skey)));
if (supports)
{
nsCOMPtr<nsIRDFDataSource> dataSource;
nsISupports *supports = NS_STATIC_CAST(nsISupports*, data);
dataSource = do_QueryInterface(supports);
nsCOMPtr<nsIRDFDataSource> dataSource = do_QueryInterface(supports);
if (dataSource)
{
*aResult = dataSource;

17
rdf/chrome/src/nsChromeRegistry.cpp
View File

@ -478,12 +478,10 @@ NS_IMETHODIMP nsChromeRegistry::GetOverlayDataSource(nsIURI *aChromeURL, nsIRDFD
overlayFile += "overlays.rdf";
nsStringKey skey(overlayFile);
void *data = mDataSourceTable->Get(&skey);
if (data)
nsCOMPtr<nsISupports> supports = getter_AddRefs(NS_STATIC_CAST(nsISupports*, mDataSourceTable->Get(&skey)));
if (supports)
{
nsCOMPtr<nsIRDFDataSource> dataSource;
nsISupports *supports = NS_STATIC_CAST(nsISupports*, data);
dataSource = do_QueryInterface(supports, &rv);
nsCOMPtr<nsIRDFDataSource> dataSource = do_QueryInterface(supports, &rv);
if (NS_SUCCEEDED(rv))
{
*aResult = dataSource;
@ -600,13 +598,10 @@ nsChromeRegistry::InitializeDataSource(nsString &aPackage,
{
// current.rdf and overlays.rdf are loaded in pairs and so if one is loaded, the other should be too.
nsStringKey skey(chromeFile);
void *data = mDataSourceTable->Get(&skey);
if (data)
nsCOMPtr<nsISupports> supports = getter_AddRefs(NS_STATIC_CAST(nsISupports*, mDataSourceTable->Get(&skey)));
if (supports)
{
nsCOMPtr<nsIRDFDataSource> dataSource;
nsISupports *supports = NS_STATIC_CAST(nsISupports*, data);
dataSource = do_QueryInterface(supports);
nsCOMPtr<nsIRDFDataSource> dataSource = do_QueryInterface(supports);
if (dataSource)
{
*aResult = dataSource;