Title: [87830] trunk/Source/WebKit/gtk
- Revision
- 87830
- Author
- x...@webkit.org
- Date
- 2011-06-01 11:38:35 -0700 (Wed, 01 Jun 2011)
Log Message
2011-06-01 Xan Lopez <xlo...@igalia.com>
Reviewed by Martin Robinson.
Explictly request the size of a pointer in malloc. Otherwise this
explodes in 64bit architectures, at least.
* webkit/webkitwebplugin.cpp:
(webkit_web_plugin_get_mimetypes): ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (87829 => 87830)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-06-01 18:36:13 UTC (rev 87829)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-06-01 18:38:35 UTC (rev 87830)
@@ -2,6 +2,16 @@
Reviewed by Martin Robinson.
+ Explictly request the size of a pointer in malloc. Otherwise this
+ explodes in 64bit architectures, at least.
+
+ * webkit/webkitwebplugin.cpp:
+ (webkit_web_plugin_get_mimetypes): ditto.
+
+2011-06-01 Xan Lopez <xlo...@igalia.com>
+
+ Reviewed by Martin Robinson.
+
[GTK] Utility methods for UA spellchecking
https://bugs.webkit.org/show_bug.cgi?id=61788
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebplugin.cpp (87829 => 87830)
--- trunk/Source/WebKit/gtk/webkit/webkitwebplugin.cpp 2011-06-01 18:36:13 UTC (rev 87829)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebplugin.cpp 2011-06-01 18:38:35 UTC (rev 87830)
@@ -241,7 +241,7 @@
mimeType->description = g_strdup(it->second.utf8().data());
Vector<String> extensions = priv->corePlugin->mimeToExtensions().get(it->first);
- mimeType->extensions = static_cast<gchar**>(g_malloc0(extensions.size() + 1));
+ mimeType->extensions = static_cast<gchar**>(g_malloc0(sizeof(char*) * (extensions.size() + 1)));
for (unsigned i = 0; i < extensions.size(); i++)
mimeType->extensions[i] = g_strdup(extensions[i].utf8().data());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
