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

fix for bug 8248. Not setting the VAL_IS_IFACE flag for purely out params when calling native from JS. All interfaces that return an interface (e.g. QueryInterface) were getting left with one extra ref. Yuck!

Browse Source
This commit is contained in:
jband%netscape.com 1999-06-16 01:29:49 +00:00
parent 8f16f22564
commit d5eb762653
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/xpconnect/src/xpcwrappednativeclass.cpp
View File

@ -520,12 +520,18 @@ nsXPCWrappedNativeClass::CallWrappedMethod(JSContext* cx,
dp->val.p = NULL;
dispatchParamsInitedCount++;
if(type.TagPart() == nsXPTType::T_INTERFACE ||
type.TagPart() == nsXPTType::T_INTERFACE_IS)
{
dp->flags |= nsXPTCVariant::VAL_IS_IFACE;
}
// set 'src' to be the object from which we get the value and
// prepare for out param
if(param.IsOut())
{
dp->flags = nsXPTCVariant::PTR_IS_DATA;
dp->flags |= nsXPTCVariant::PTR_IS_DATA;
dp->ptr = &dp->val;
if(!param.IsRetval() &&
@ -558,8 +564,6 @@ nsXPCWrappedNativeClass::CallWrappedMethod(JSContext* cx,
if(type.TagPart() == nsXPTType::T_INTERFACE)
{
dp->flags |= nsXPTCVariant::VAL_IS_IFACE;
if(NS_FAILED(GetInterfaceInfo()->
GetIIDForParam(&param, &conditional_iid)))
{
@ -570,8 +574,6 @@ nsXPCWrappedNativeClass::CallWrappedMethod(JSContext* cx,
}
else if(type.TagPart() == nsXPTType::T_INTERFACE_IS)
{
dp->flags |= nsXPTCVariant::VAL_IS_IFACE;
uint8 arg_num = param.GetInterfaceIsArgNumber();
const nsXPTParamInfo& param = info->GetParam(arg_num);
const nsXPTType& type = param.GetType();