[fix bug 1303076] Fix plugincheck to avoid enumerating on navigator.m…

…imeTypes
mozilla · Sep 23, 2016 · 05c4b3b · 05c4b3b
1 parent 96f64ee
commit 05c4b3b
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/media/js/plugincheck/lib/plugincheck.js b/media/js/plugincheck/lib/plugincheck.js
@@ -14,17 +14,19 @@
      */
     function setJavaVersion() {
         var type;
-        var installedVersion;
+        var installedVersion = '0.0.0'; // fallback is better than throwing an error
         var mimes = navigator.mimeTypes['application/x-java-applet'].enabledPlugin;
 
-        for (var mime in mimes) {
-            if(mimes.hasOwnProperty(mime) && mime.indexOf('jpi-version') > -1) {
-                type = mime;
-                // + 3 to strip of the leading 1. in java versions
-                installedVersion = type.substring(type.indexOf('=') + 3)
-                    .replace('_', '.');
-            }
+        var mime = Object.keys(mimes).filter(function(key) {
+            return mimes[key].type.indexOf('jpi-version') > -1;
+        });
+
+        if (mime.length > 0) {
+            type = mimes[mime[0]].type;
+            // + 3 to strip of the leading 1. in java versions
+            installedVersion = type.substring(type.indexOf('=') + 3).replace('_', '.');
         }
+
         return installedVersion;
     }