summaryrefslogtreecommitdiff
path: root/src/fe-common
diff options
context:
space:
mode:
authorEmanuele Giaquinta <exg@irssi.org>2008-05-23 09:59:59 +0000
committerexg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564>2008-05-23 09:59:59 +0000
commit3236daa97a342903ba988d9395e7fe8222d41e12 (patch)
tree727813c40106f387ce572b5938ff8d2a817ce27c /src/fe-common
parent54f5beb8f5b0c98db5363f006e9d46753f30a704 (diff)
downloadirssi-3236daa97a342903ba988d9395e7fe8222d41e12.zip
Fix leaks.
git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4845 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common')
-rw-r--r--src/fe-common/core/completion.c2
-rw-r--r--src/fe-common/core/fe-messages.c3
-rw-r--r--src/fe-common/core/keyboard.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c
index a8eab9bd..a145eb69 100644
--- a/src/fe-common/core/completion.c
+++ b/src/fe-common/core/completion.c
@@ -197,8 +197,6 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i
signal_emit("complete erase", 3, window, word, linestart);
/* jump to next completion */
- word = NULL;
- linestart = NULL;
startpos = old_startpos;
wordlen = old_wordlen;
}
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index e1c0e57a..a5bcd2b0 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -257,7 +257,7 @@ static void sig_message_own_public(SERVER_REC *server, const char *msg,
{
WINDOW_REC *window;
CHANNEL_REC *channel;
- const char *nickmode;
+ char *nickmode;
char *freemsg = NULL;
int print_channel;
channel = channel_find(server, target);
@@ -287,6 +287,7 @@ static void sig_message_own_public(SERVER_REC *server, const char *msg,
TXT_OWN_MSG_CHANNEL, server->nick, target, msg, nickmode);
}
+ g_free_not_null(nickmode);
g_free_not_null(freemsg);
}
diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c
index cebb9af0..7c3ad5d5 100644
--- a/src/fe-common/core/keyboard.c
+++ b/src/fe-common/core/keyboard.c
@@ -228,6 +228,7 @@ static int expand_combo(const char *start, const char *end, GSList **out)
if (list->next == NULL) {
/* only one way to generate the combo, good */
rec = list->data;
+ g_slist_free(list);
return expand_key(rec->key, out);
}
@@ -252,6 +253,7 @@ static int expand_combo(const char *start, const char *end, GSList **out)
}
rec = list->data;
+ g_slist_free(list);
if (!expand_key(rec->key, out)) {
/* illegal key combo, remove from list */
expand_out_free(*out);