Rewrite search query creation

* malloc was allocating 1 char too few
* switch to using gchar/g_free
* remove redundant variable

diff --git a/src/browser.c b/src/browser.c
index 1d25b77db41240d0fd9b065a58a32c491ae1cdd5..d3f9e12d1a01fe99cb0d2fe8d66b634be3f4a84e 100644 (file)
--- a/src/browser.c
+++ b/src/browser.c
@@ -962,12 +962,11 @@ key_location(GtkWidget *widget, GdkEvent *event, gpointer data) {
                 search_text = g_strdup(t + 2);
                 search(c, 0);
             } else if (t != NULL && t[0] == 'w' && t[1] == '/') {
                 search_text = g_strdup(t + 2);
                 search(c, 0);
             } else if (t != NULL && t[0] == 'w' && t[1] == '/') {

-                const char *engine = cfg.search_engine;
-                int len = strlen(engine) + strlen(t) - 2;
-                char *f = (char *)malloc(len);
-                snprintf(f, len + 1, "%s%s", engine, t + 2);
+                int len = strlen(cfg.search_engine) + strlen(t) - 2;
+                gchar *f = malloc(len + 1);
+                snprintf(f, len + 1, "%s%s", cfg.search_engine, t + 2);

                 webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
                 webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);

-                free(f);
+                g_free(f);

             } else {
                 f = ensure_uri_scheme(t);
                 webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
             } else {
                 f = ensure_uri_scheme(t);
                 webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);