Fix for bug 310068 (XPCNativeWrapper fails to look up named properties on HTMLCollection). r/sr=bz.

This commit is contained in:
peterv%propagandism.org 2005-09-28 13:44:31 +00:00
parent 8702e6b0aa
commit 15e14dbf57

View File

@ -6690,11 +6690,12 @@ nsArraySH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
rv = WrapNative(cx, obj, array_item, NS_GET_IID(nsISupports), vp,
getter_AddRefs(holder));
NS_ENSURE_SUCCESS(rv, rv);
rv = NS_SUCCESS_I_DID_SOMETHING;
}
else {
*vp = JSVAL_VOID;
}
rv = NS_SUCCESS_I_DID_SOMETHING;
}
return rv;
@ -6732,13 +6733,15 @@ nsNamedArraySH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
rv = WrapNative(cx, obj, item, NS_GET_IID(nsISupports), vp,
getter_AddRefs(holder));
NS_ENSURE_SUCCESS(rv, rv);
rv = NS_SUCCESS_I_DID_SOMETHING;
}
else {
*vp = JSVAL_VOID;
}
// Don't fall through to nsArraySH::GetProperty() here
return NS_SUCCESS_I_DID_SOMETHING;
return rv;
}
return nsArraySH::GetProperty(wrapper, cx, obj, id, vp, _retval);