diff options
| author |  Robert Manea <gotmor@gmail.com> | 2009-05-15 16:18:28 +0200 |
|---|---|---|
| committer | Robert Manea <gotmor@gmail.com> | 2009-05-15 16:18:28 +0200 |
| commit | 9ec1dd0b2bdd9a541c5552a85a164c79cf222e55 (patch) | |
| tree | 1b6f1fa45a89f083168a3d32c6271fa42de57670 /uzbl.c | |
| parent | 114df42ec53d1ba41340559a0dabf29b921a1c56 (diff) | |
free memory returned by itos()
Diffstat (limited to 'uzbl.c')
| -rw-r--r-- | uzbl.c | 26 |
1 files changed, 19 insertions, 7 deletions
@@ -585,7 +585,7 @@ expand_template(const char *template) { GTokenType token = G_TOKEN_NONE; GString *ret = g_string_new(""); - gchar *buf=NULL; + char *buf=NULL; int sym; g_scanner_input_text(uzbl.scan, template, strlen(template)); @@ -601,7 +601,9 @@ expand_template(const char *template) { g_markup_printf_escaped("%s", uzbl.state.uri):""); break; case SYM_LOADPRGS: - g_string_append(ret, itos(uzbl.gui.sbar.load_progress)); + buf = itos(uzbl.gui.sbar.load_progress); + g_string_append(ret, buf); + free(buf); break; case SYM_LOADPRGSBAR: buf = build_progressbar_ascii(uzbl.gui.sbar.load_progress); @@ -614,8 +616,10 @@ expand_template(const char *template) { g_markup_printf_escaped("%s", uzbl.gui.main_title):""); break; case SYM_NAME: + buf = itos(uzbl.xwin); g_string_append(ret, - uzbl.state.instance_name?uzbl.state.instance_name:itos(uzbl.xwin)); + uzbl.state.instance_name?uzbl.state.instance_name:buf); + free(buf); break; case SYM_KEYCMD: g_string_append(ret, @@ -632,13 +636,19 @@ expand_template(const char *template) { break; /* useragent syms */ case SYM_WK_MAJ: - g_string_append(ret, itos(WEBKIT_MAJOR_VERSION)); + buf = itos(WEBKIT_MAJOR_VERSION); + g_string_append(ret, buf); + free(buf); break; case SYM_WK_MIN: - g_string_append(ret, itos(WEBKIT_MINOR_VERSION)); + buf = itos(WEBKIT_MINOR_VERSION); + g_string_append(ret, buf); + free(buf); break; case SYM_WK_MIC: - g_string_append(ret, itos(WEBKIT_MICRO_VERSION)); + buf = itos(WEBKIT_MICRO_VERSION); + g_string_append(ret, buf); + free(buf); break; case SYM_SYSNAME: g_string_append(ret, uzbl.state.unameinfo.sysname); @@ -671,7 +681,9 @@ expand_template(const char *template) { } } else if(token == G_TOKEN_INT) { - g_string_append(ret, itos(g_scanner_cur_value(uzbl.scan).v_int)); + buf = itos(g_scanner_cur_value(uzbl.scan).v_int); + g_string_append(ret, buf); + free(buf); } else if(token == G_TOKEN_IDENTIFIER) { g_string_append(ret, (gchar *)g_scanner_cur_value(uzbl.scan).v_identifier); |