799396 - Use Map instead of object literal in browser-plugins.js for hash tables

Status: RESOLVED FIXED

(Firefox :: General, defect)

Description

[Jared Wein [:jaws] (please needinfo? me)]

Attachment: Patch

The object literal that is used to track missingPlugins as well as the list of the plugins on a page currently use object literals. If a plugin were to have the name of "__proto__" this could cause some really odd bugs to crop up.

I've converted the usages of these object literals to use Map, which won't suffer from these issues.

Comment 1

[Dão Gottwald [:dao]]

Is it possible for a mime type to be "__proto__" and still reach this front-end code?

Comment 2

[Jesse Ruderman]

We already know it's possible for the mime type to be "9000" (bug 797677) here, so it's likely that "__proto__" or "watch" can reach here as well.

Fwiw:

> Object.getOwnPropertyNames(Object.prototype)
constructor,toSource,toString,toLocaleString,valueOf,watch,unwatch,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,__defineGetter__,__defineSetter__,__lookupGetter__,__lookupSetter__

Comment 3

[Dana Keeler (she/her) [:keeler]]

Comment on attachment 669414 [details] [diff] [review]
Patch

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

Looks good to me.

Comment 4

[Dão Gottwald [:dao]]

Comment on attachment 669414 [details] [diff] [review]
Patch

>--- a/toolkit/mozapps/plugins/content/pluginInstallerWizard.js
>+++ b/toolkit/mozapps/plugins/content/pluginInstallerWizard.js
>@@ -30,19 +30,19 @@ function nsPluginInstallerWizard(){
>   this.mNeedsRestart = false;
> 
>   // arguments[0] is an array that contains two items:
>   //     an array of mimetypes that are missing

This comment needs an update.

>   //     a reference to the browser that needs them, 
>   //        so we can notify which browser can be reloaded.
> 
>   if ("arguments" in window) {
>-    for (var item in window.arguments[0].plugins){
>-      this.mPluginRequestArray[window.arguments[0].plugins[item].mimetype] =
>-        new nsPluginRequest(window.arguments[0].plugins[item]);
>+    for (let [item, pluginInfo] of window.arguments[0].plugins){
>+      this.mPluginRequestArray[pluginInfo.mimetype] =
>+        new nsPluginRequest(pluginInfo);

"item" is actually the mime type here, if I understand correctly. Please rename it accordingly and use it instead of pluginInfo.mimetype.

Comment 5

[Jared Wein [:jaws] (please needinfo? me)]

Attachment: Patch v1.1

While fixing the nits I noticed another object in pluginInstallerWizard.js that could be converted to a Map.

Comment 6

[Dão Gottwald [:dao]]

Comment on attachment 669826 [details] [diff] [review]
Patch v1.1

This is the same patch as the previous one.

Comment 7

[Jared Wein [:jaws] (please needinfo? me)]

Attachment: Patch v1.1 (qref'd)

Sorry about that, forgot to qref.

Comment 8

[Dão Gottwald [:dao]]

Comment on attachment 669830 [details] [diff] [review]
Patch v1.1 (qref'd)

>+  //     a map of (key=mimetype, value=pluginInfo object) that are missing,

"a mimetype->pluginInfo map of missing plugins"

Comment 9

[Jared Wein [:jaws] (please needinfo? me)]

Thanks.

https://hg.mozilla.org/integration/mozilla-inbound/rev/c144e89952c1

Comment 10

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/c144e89952c1