Changeset 87830 in webkit

Timestamp:

Jun 1, 2011, 11:38:35 AM (14 years ago)

Author:

xan@webkit.org

Message:

2011-06-01 Xan Lopez <​xlopez@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.

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkitwebplugin.cpp (modified) (1 diff)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-06-01  Xan Lopez  <xlopez@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.
+
 2011-06-01  Xan Lopez  <xlopez@igalia.com>
 

trunk/Source/WebKit/gtk/webkit/webkitwebplugin.cpp

@@ -242 +242 @@
 
         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());