Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 334515: Use nsWeakPtr rather than raw pointers to avoid crashes. r/sr=dbaron

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@195314 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cvshook%sicking.cc
2006-04-25 00:44:30 +00:00
parent cc0601bc8d
commit b0cf41e97f
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/embedding/components/commandhandler/src/nsBaseCommandController.cpp
View File

@@ -55,7 +55,6 @@ NS_INTERFACE_MAP_BEGIN(nsBaseCommandController)
NS_INTERFACE_MAP_END
nsBaseCommandController::nsBaseCommandController()
: mCommandContext(nsnull)
{
}
@@ -79,7 +78,7 @@ nsBaseCommandController::Init(nsIControllerCommandTable *aCommandTable)
NS_IMETHODIMP
nsBaseCommandController::SetCommandContext(nsISupports *aCommandContext)
{
mCommandContext = aCommandContext; // no addref
mCommandContext = do_GetWeakReference(aCommandContext);
return NS_OK;
}
@@ -114,7 +113,8 @@ nsBaseCommandController::IsCommandEnabled(const char *aCommand,
NS_ENSURE_ARG_POINTER(aCommand);
NS_ENSURE_ARG_POINTER(aResult);
NS_ENSURE_STATE(mCommandTable);
return mCommandTable->IsCommandEnabled(aCommand, mCommandContext, aResult);
nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
return mCommandTable->IsCommandEnabled(aCommand, context, aResult);
}
NS_IMETHODIMP
@@ -123,7 +123,8 @@ nsBaseCommandController::SupportsCommand(const char *aCommand, PRBool *aResult)
NS_ENSURE_ARG_POINTER(aCommand);
NS_ENSURE_ARG_POINTER(aResult);
NS_ENSURE_STATE(mCommandTable);
return mCommandTable->SupportsCommand(aCommand, mCommandContext, aResult);
nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
return mCommandTable->SupportsCommand(aCommand, context, aResult);
}
NS_IMETHODIMP
@@ -131,7 +132,8 @@ nsBaseCommandController::DoCommand(const char *aCommand)
{
NS_ENSURE_ARG_POINTER(aCommand);
NS_ENSURE_STATE(mCommandTable);
return mCommandTable->DoCommand(aCommand, mCommandContext);
nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
return mCommandTable->DoCommand(aCommand, context);
}
NS_IMETHODIMP
@@ -140,7 +142,8 @@ nsBaseCommandController::DoCommandWithParams(const char *aCommand,
{
NS_ENSURE_ARG_POINTER(aCommand);
NS_ENSURE_STATE(mCommandTable);
return mCommandTable->DoCommandParams(aCommand, aParams, mCommandContext);
nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
return mCommandTable->DoCommandParams(aCommand, aParams, context);
}
NS_IMETHODIMP
@@ -149,7 +152,8 @@ nsBaseCommandController::GetCommandStateWithParams(const char *aCommand,
{
NS_ENSURE_ARG_POINTER(aCommand);
NS_ENSURE_STATE(mCommandTable);
return mCommandTable->GetCommandState(aCommand, aParams, mCommandContext);
nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
return mCommandTable->GetCommandState(aCommand, aParams, context);
}
NS_IMETHODIMP