aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Fixed memory leaks in chat logs

Browse Source 
issue #226
This commit is contained in:
James Booth 2013-09-23 01:05:07 +01:00
parent cb507497b6
commit 25b274b8d1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/log.c
View File

@ -214,18 +214,17 @@ void
chat_log_chat(const gchar * const login, gchar *other, chat_log_chat(const gchar * const login, gchar *other,
const gchar * const msg, chat_log_direction_t direction, GTimeVal *tv_stamp) const gchar * const msg, chat_log_direction_t direction, GTimeVal *tv_stamp)
{ {
gchar *other_copy = strdup(other); struct dated_chat_log *dated_log = g_hash_table_lookup(logs, other);
struct dated_chat_log *dated_log = g_hash_table_lookup(logs, other_copy);
// no log for user // no log for user
if (dated_log == NULL) { if (dated_log == NULL) {
dated_log = _create_log(other_copy, login); dated_log = _create_log(other, login);
g_hash_table_insert(logs, other_copy, dated_log); g_hash_table_insert(logs, strdup(other), dated_log);
// log exists but needs rolling // log exists but needs rolling
} else if (_log_roll_needed(dated_log)) { } else if (_log_roll_needed(dated_log)) {
dated_log = _create_log(other_copy, login); dated_log = _create_log(other, login);
g_hash_table_replace(logs, other_copy, dated_log); g_hash_table_replace(logs, strdup(other), dated_log);
} }
gchar *date_fmt = NULL; gchar *date_fmt = NULL;
@ -242,9 +241,9 @@ chat_log_chat(const gchar * const login, gchar *other,
if (direction == PROF_IN_LOG) { if (direction == PROF_IN_LOG) {
if (strncmp(msg, "/me ", 4) == 0) { if (strncmp(msg, "/me ", 4) == 0) {
fprintf(logp, "%s - *%s %s\n", date_fmt, other_copy, msg + 4); fprintf(logp, "%s - *%s %s\n", date_fmt, other, msg + 4);
} else { } else {
fprintf(logp, "%s - %s: %s\n", date_fmt, other_copy, msg); fprintf(logp, "%s - %s: %s\n", date_fmt, other, msg);
} }
} else { } else {
if (strncmp(msg, "/me ", 4) == 0) { if (strncmp(msg, "/me ", 4) == 0) {
@ -413,8 +412,8 @@ _free_chat_log(struct dated_chat_log *dated_log)
g_date_time_unref(dated_log->date); g_date_time_unref(dated_log->date);
dated_log->date = NULL; dated_log->date = NULL;
} }
free(dated_log);
} }
dated_log = NULL;
} }
static static
@ -450,6 +449,7 @@ _get_log_filename(const char * const other, const char * const login,
gchar *date = g_date_time_format(dt, "/%Y_%m_%d.log"); gchar *date = g_date_time_format(dt, "/%Y_%m_%d.log");
g_string_append(log_file, date); g_string_append(log_file, date);
g_free(date);
char *result = strdup(log_file->str); char *result = strdup(log_file->str);
g_string_free(log_file, TRUE); g_string_free(log_file, TRUE);