Changeset 136697 in webkit

Timestamp:

Dec 5, 2012, 9:09:34 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[Gtk] navigator.plugins contains too many plugin entries. First one are garbages
​https://bugs.webkit.org/show_bug.cgi?id=102438

Patch by Arnaud Renevier <​a.renevier@sisa.samsung.com> on 2012-12-05
Reviewed by Xan Lopez.

Source/WebKit/gtk:

In getPluginInfo, outPlugins is resized to plugins.size and then,
plugins are appended to it. So at the end, outPlugins will be twice
too large, and first half will contain null objects. As outPlugins
size is 0 when calling getPluginInfo, we don't need to resize it.

• WebCoreSupport/PlatformStrategiesGtk.cpp:

(PlatformStrategiesGtk::getPluginInfo):

LayoutTests:

Add a test to check that navigator.plugins only contain valid plugin
objects.

• plugins/navigator-plugins-expected.txt: Added.
• plugins/navigator-plugins.html: Added.
• plugins/script-tests/navigator-plugins.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/plugins/navigator-plugins-expected.txt (added)
• LayoutTests/plugins/navigator-plugins.html (added)
• LayoutTests/plugins/script-tests/navigator-plugins.js (added)
• Source/WebKit/gtk/ChangeLog (modified) (1 diff)
• Source/WebKit/gtk/WebCoreSupport/PlatformStrategiesGtk.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-12-05  Arnaud Renevier  <a.renevier@sisa.samsung.com>
+
+        [Gtk] navigator.plugins contains too many plugin entries. First one are garbages
+        https://bugs.webkit.org/show_bug.cgi?id=102438
+
+        Reviewed by Xan Lopez.
+
+        Add a test to check that navigator.plugins only contain valid plugin
+        objects.
+
+        * plugins/navigator-plugins-expected.txt: Added.
+        * plugins/navigator-plugins.html: Added.
+        * plugins/script-tests/navigator-plugins.js: Added.
+
 2012-12-05  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-12-05  Arnaud Renevier  <a.renevier@sisa.samsung.com>
+
+        [Gtk] navigator.plugins contains too many plugin entries. First one are garbages
+        https://bugs.webkit.org/show_bug.cgi?id=102438
+
+        Reviewed by Xan Lopez.
+
+        In getPluginInfo, outPlugins is resized to plugins.size and then,
+        plugins are appended to it. So at the end, outPlugins will be twice
+        too large, and first half will contain null objects. As outPlugins
+        size is 0 when calling getPluginInfo, we don't need to resize it.
+
+        * WebCoreSupport/PlatformStrategiesGtk.cpp:
+        (PlatformStrategiesGtk::getPluginInfo):
+
 2012-12-04  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/gtk/WebCoreSupport/PlatformStrategiesGtk.cpp

@@ -131 +131 @@
     PluginDatabase* database = PluginDatabase::installedPlugins();
     const Vector<PluginPackage*> &plugins = database->plugins();
-    outPlugins.resize(plugins.size());
 
     for (size_t i = 0; i < plugins.size(); ++i) {