Bug 371694 - Protect ourselves against null values. r=dveditz

This commit is contained in:
Blake Kaplan 2010-03-22 15:50:04 -07:00
parent d72e0db783
commit 9c71e872ce

View file

@ -813,13 +813,13 @@ nsScriptSecurityManager::CheckPropertyAccessImpl(PRUint32 aAction,
{ {
nsCOMPtr<nsIXPConnectWrappedNative> wrapper; nsCOMPtr<nsIXPConnectWrappedNative> wrapper;
nsCOMPtr<nsIInterfaceInfo> interfaceInfo; nsCOMPtr<nsIInterfaceInfo> interfaceInfo;
const nsIID* objIID; const nsIID* objIID = nsnull;
rv = aCallContext->GetCalleeWrapper(getter_AddRefs(wrapper)); rv = aCallContext->GetCalleeWrapper(getter_AddRefs(wrapper));
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv) && wrapper)
rv = wrapper->FindInterfaceWithMember(aProperty, getter_AddRefs(interfaceInfo)); rv = wrapper->FindInterfaceWithMember(aProperty, getter_AddRefs(interfaceInfo));
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv) && interfaceInfo)
rv = interfaceInfo->GetIIDShared(&objIID); rv = interfaceInfo->GetIIDShared(&objIID);
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv) && objIID)
{ {
switch (aAction) switch (aAction)
{ {