Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 21:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 113856. Don't crash when resolving a name of a class w/o a primary iid. r=heikki@netscape.com, sr=vidur@netscape.com

Browse Source
This commit is contained in:
jst%netscape.com 2002-02-02 01:31:22 +00:00
parent 97c85e367d
commit 09364bd390
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dom/src/base/nsDOMClassInfo.cpp
View File

@ -3162,19 +3162,21 @@ nsWindowSH::GlobalResolve(nsISupports *native, JSContext *cx, JSObject *obj,
return NS_ERROR_UNEXPECTED;
}
const nsDOMClassInfoData *ci_data = nsnull;
if (name_struct->mType == nsGlobalNameStruct::eTypeClassConstructor &&
name_struct->mDOMClassInfoID >= 0) {
ci_data = &sClassInfoData[name_struct->mDOMClassInfoID];
}
const nsIID *primary_iid = &NS_GET_IID(nsISupports);
if (name_struct->mType == nsGlobalNameStruct::eTypeClassProto) {
primary_iid = &name_struct->mIID;
} else if (name_struct->mDOMClassInfoID >= 0) {
primary_iid =
sClassInfoData[name_struct->mDOMClassInfoID].mProtoChainInterface;
} else if (ci_data && ci_data->mProtoChainInterface) {
primary_iid = ci_data->mProtoChainInterface;
}
NS_ABORT_IF_FALSE(!primary_iid->Equals(NS_GET_IID(nsISupports)),
"Class with nsISupports as primary IID seen in the "
"resolver");
nsXPIDLCString class_parent_name;
if (!primary_iid->Equals(NS_GET_IID(nsISupports))) {
@ -3197,13 +3199,6 @@ nsWindowSH::GlobalResolve(nsISupports *native, JSContext *cx, JSObject *obj,
iim->GetInfoForIID(primary_iid, getter_AddRefs(if_info));
NS_ENSURE_TRUE(if_info, NS_ERROR_UNEXPECTED);
const nsDOMClassInfoData *ci_data = nsnull;
if (name_struct->mType == nsGlobalNameStruct::eTypeClassConstructor &&
name_struct->mDOMClassInfoID >= 0) {
ci_data = &sClassInfoData[name_struct->mDOMClassInfoID];
}
nsCOMPtr<nsIInterfaceInfo> parent;
nsIID *iid = nsnull;