Changeset 149666 in webkit

Timestamp:

May 7, 2013 12:42:15 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Initialize WebKitWebPlugin path to prevent double-free
​https://bugs.webkit.org/show_bug.cgi?id=115624

Patch by Tomas Popela <​tpopela@redhat.com> on 2013-05-07
Reviewed by Carlos Garcia Campos.

Use GOwnPtr for WebKitWebPlugin path to prevent double-free
situations. Also use GOwnPtr for GError in webkit_web_plugin_get_path.

• webkit/webkitwebplugin.cpp:

(webkit_web_plugin_finalize):
(webkit_web_plugin_get_path):

• webkit/webkitwebpluginprivate.h:

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkitwebplugin.cpp (modified) (2 diffs)
• webkit/webkitwebpluginprivate.h (modified) (2 diffs)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2013-05-07  Tomas Popela  <tpopela@redhat.com>
+
+        [GTK] Initialize WebKitWebPlugin path to prevent double-free
+        https://bugs.webkit.org/show_bug.cgi?id=115624
+
+        Reviewed by Carlos Garcia Campos.
+
+        Use GOwnPtr for WebKitWebPlugin path to prevent double-free
+        situations. Also use GOwnPtr for GError in webkit_web_plugin_get_path.
+
+        * webkit/webkitwebplugin.cpp:
+        (webkit_web_plugin_finalize):
+        (webkit_web_plugin_get_path):
+        * webkit/webkitwebpluginprivate.h:
+
 2013-05-06  Zan Dobersek  <zdobersek@igalia.com>
 

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

@@ -64 +64 @@
     WebKitWebPluginPrivate* priv = plugin->priv;
 
-    g_free(priv->path);
-
     g_slist_foreach(priv->mimeTypes, (GFunc)freeMIMEType, 0);
     g_slist_free(priv->mimeTypes);
@@ -192 +190 @@
 
     if (priv->path)
-        return priv->path;
-
-    GError* error = 0;
-    priv->path = g_filename_from_utf8(priv->corePlugin->path().utf8().data(), -1, 0, 0, &error);
+        return priv->path.get();
+
+    GOwnPtr<GError> error;
+    priv->path.set(g_filename_from_utf8(priv->corePlugin->path().utf8().data(), -1, 0, 0, &error.outPtr()));
 
     if (!error)
-        return priv->path;
+        return priv->path.get();
 
     // In the unlikely case the convertion fails, report the error and make sure we free
     // any partial convertion that ended up in the variable.
-    g_free(priv->path);
-    priv->path = 0;
+    priv->path.clear();
 
     g_warning("Failed to convert '%s' to system filename encoding: %s", priv->corePlugin->path().utf8().data(), error->message);
-
-    g_clear_error(&error);
 
     return 0;

trunk/Source/WebKit/gtk/webkit/webkitwebpluginprivate.h

@@ -22 +22 @@
 #include "webkitwebplugin.h"
 #include <glib-object.h>
+#include <wtf/gobject/GOwnPtr.h>
 #include <wtf/text/CString.h>
 
@@ -39 +40 @@
     CString name;
     CString description;
-    char* path;
+    GOwnPtr<char> path;
     GSList* mimeTypes;
 };