758227 - NPAPI plugin stream decomtamination: nsIPluginStreamInfo

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Josh Aas]

Attachment: fix v1.0

nsIPluginStreamInfo is unnecessary and its implementation contributes quite a bit to the complexity of our stream handling.

This patch depends on the fix in bug 758224 - without it this patch will cause a double-free crash.

Comment 1

[Benjamin Smedberg]

Comment on attachment 626814 [details] [diff] [review]
fix v1.0

>diff --git a/dom/plugins/base/nsNPAPIPlugin.cpp b/dom/plugins/base/nsNPAPIPlugin.cpp

>-  nsPluginStreamListenerPeer* peer = listener->GetStreamListenerPeer();
>-  if (!peer)
>+  nsIStreamListener* streamListener = static_cast<nsIStreamListener*>(listener->GetStreamListenerPeer());
>+  if (!streamListener) {
>     return NPERR_GENERIC_ERROR;

Why is the static_cast necessary? It looks like it should be an automatic downcast and is a bit confusing. Please remove.

>-
>-  *aRetainedPeer = (nsISupports*) peer;
>+  }
>+
>+  *aRetainedPeer = static_cast<nsISupports*>(streamListener);

Also unnecessary here.

Comment 2

[Josh Aas]

Attachment: fix v1.1

Try server run:

https://tbpl.mozilla.org/?tree=Try&rev=1a64bb0c5665

Comment 3

[Josh Aas]

Problems with Android try server runs, here is an Android-only retry:

https://tbpl.mozilla.org/?tree=Try&rev=49f978ba6959

Comment 4

[Josh Aas]

pushed to mozilla-inbound:

http://hg.mozilla.org/integration/mozilla-inbound/rev/8dd2e853993e

Comment 5

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/8dd2e853993e