Changed pointer for plugin-blocker, fixed memory leak, Nullterminated strings in 'dwb_execute_script'

1 files changed, 5 insertions, 7 deletions

diff --git a/src/plugins.c b/src/plugins.c
index 60efb87d..7484a5ae 100644
--- a/src/plugins.c
+++ b/src/plugins.c
@@ -9,20 +9,18 @@ GtkWidget *
 dwb_plugins_create_cb(WebKitWebView *wv, char *mimetype, char *uri, GHashTable *param, GList *gl) {
   GtkWidget *ret = NULL;
   if (!strcmp(mimetype, "application/x-shockwave-flash")) {
+    char *value = NULL, *id, *command;
     GString *string = g_string_new(NULL);
     g_hash_table_foreach(param, (GHFunc)dwb_plugins_get_embed_values, &string);
-    char *id = g_hash_table_lookup(param, "id");
-    char *command = g_strdup_printf("DwbPlugin.remove('%s', '%s')", id, string->str);
+    id = g_hash_table_lookup(param, "id");
+    command = g_strdup_printf("DwbPlugin.remove('%s', '%s', '%s')", id, string->str, mimetype);
     g_string_free(string, true);
-    char *value;
     dwb_execute_script(wv, command, &value);
     g_free(command);
-    if (value && !strcmp(value, "__dwb__blocked__")) {
-      g_free(value);
-    }
-    else {
+    if (!value || strcmp(value, "__dwb__blocked__")) {
       ret = gtk_event_box_new();
     }
+    FREE(value);
   }
   return ret;
 }