From a757cb0909826d6f686752c4be4b0a80bb2cf3e2 Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Thu, 30 Mar 2006 19:35:38 +0000 Subject: [PATCH] Bug 332132 OOM crash in nsBaseCommandController methods r=smfr sr=neil --- .../src/nsBaseCommandController.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/embedding/components/commandhandler/src/nsBaseCommandController.cpp b/embedding/components/commandhandler/src/nsBaseCommandController.cpp index d17edbfc774c..808ad2b4d453 100644 --- a/embedding/components/commandhandler/src/nsBaseCommandController.cpp +++ b/embedding/components/commandhandler/src/nsBaseCommandController.cpp @@ -47,11 +47,11 @@ NS_IMPL_ADDREF(nsBaseCommandController) NS_IMPL_RELEASE(nsBaseCommandController) NS_INTERFACE_MAP_BEGIN(nsBaseCommandController) - NS_INTERFACE_MAP_ENTRY(nsIController) - NS_INTERFACE_MAP_ENTRY(nsICommandController) - NS_INTERFACE_MAP_ENTRY(nsIControllerContext) - NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor) - NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIControllerContext) + NS_INTERFACE_MAP_ENTRY(nsIController) + NS_INTERFACE_MAP_ENTRY(nsICommandController) + NS_INTERFACE_MAP_ENTRY(nsIControllerContext) + NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor) + NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIControllerContext) NS_INTERFACE_MAP_END nsBaseCommandController::nsBaseCommandController() @@ -113,6 +113,7 @@ 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); } @@ -121,6 +122,7 @@ 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); } @@ -128,6 +130,7 @@ NS_IMETHODIMP nsBaseCommandController::DoCommand(const char *aCommand) { NS_ENSURE_ARG_POINTER(aCommand); + NS_ENSURE_STATE(mCommandTable); return mCommandTable->DoCommand(aCommand, mCommandContext); } @@ -136,6 +139,7 @@ nsBaseCommandController::DoCommandWithParams(const char *aCommand, nsICommandParams *aParams) { NS_ENSURE_ARG_POINTER(aCommand); + NS_ENSURE_STATE(mCommandTable); return mCommandTable->DoCommandParams(aCommand, aParams, mCommandContext); } @@ -144,6 +148,7 @@ nsBaseCommandController::GetCommandStateWithParams(const char *aCommand, nsICommandParams *aParams) { NS_ENSURE_ARG_POINTER(aCommand); + NS_ENSURE_STATE(mCommandTable); return mCommandTable->GetCommandState(aCommand, aParams, mCommandContext); }