760131 - Quickstub argument unwrapping fails for security-wrapped list proxy and paris binding objects

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, defect)

Description

[Peter Van der Beken [:peterv]]

This was the cause of bug 743325.

Comment 1

[Peter Van der Beken [:peterv]]

Attachment: v1

The main issue was that xpc_qsUnwrapArgImpl didn't unwrap security wrappers before checking mozilla::dom::binding::instanceIsProxy.

Comment 2

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 631104 [details] [diff] [review]
v1

Would it make sense to test for IsDOMClass before InstanceIsProxy in both getWrapper and castNative?  Which do we think will be more common?

r=me in either case.

Comment 3

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

Comment on attachment 631104 [details] [diff] [review]
v1

Review of attachment 631104 [details] [diff] [review]:
-----------------------------------------------------------------

::: js/xpconnect/src/XPCQuickStubs.cpp
@@ +697,5 @@
>      *tearoff = nsnull;
>  
> +    js::Class* clasp = js::GetObjectClass(obj);
> +    if (mozilla::dom::binding::instanceIsProxy(obj) ||
> +        mozilla::dom::IsDOMClass(clasp)) {

You can drop the 'mozilla::' here

@@ +754,5 @@
> +        if (mozilla::dom::binding::instanceIsProxy(cur)) {
> +            native = static_cast<nsISupports*>(js::GetProxyPrivate(cur).toPrivate());
> +            entries = nsnull;
> +        } else if (mozilla::dom::IsDOMClass(clasp)) {
> +            native = mozilla::dom::UnwrapDOMObject<nsISupports>(cur);

And here

@@ +761,4 @@
>              native = static_cast<nsISupports*>(xpc_GetJSPrivate(cur));
>              entries = GetOffsetsFromSlimWrapper(cur);
>          } else {
> +            NS_NOTREACHED("what kind of wrapper is this?");

MOZ_NOT_REACHED?

Comment 4

[Peter Van der Beken [:peterv]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/2fdee4a75df4

Comment 5

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/2fdee4a75df4