From 25b274b8d1b322121edcfa4bf4cff6f03b9c820e Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Mon, 23 Sep 2013 01:05:07 +0100
Subject: Fixed memory leaks in chat logs

issue #226
---
 src/log.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/log.c')

diff --git a/src/log.c b/src/log.c
index 14d801a9..5a278872 100644
--- a/src/log.c
+++ b/src/log.c
@@ -214,18 +214,17 @@ void
 chat_log_chat(const gchar * const login, gchar *other,
     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_copy);
+    struct dated_chat_log *dated_log = g_hash_table_lookup(logs, other);
 
     // no log for user
     if (dated_log == NULL) {
-        dated_log = _create_log(other_copy, login);
-        g_hash_table_insert(logs, other_copy, dated_log);
+        dated_log = _create_log(other, login);
+        g_hash_table_insert(logs, strdup(other), dated_log);
 
     // log exists but needs rolling
     } else if (_log_roll_needed(dated_log)) {
-        dated_log = _create_log(other_copy, login);
-        g_hash_table_replace(logs, other_copy, dated_log);
+        dated_log = _create_log(other, login);
+        g_hash_table_replace(logs, strdup(other), dated_log);
     }
 
     gchar *date_fmt = NULL;
@@ -242,9 +241,9 @@ chat_log_chat(const gchar * const login, gchar *other,
 
     if (direction == PROF_IN_LOG) {
         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 {
-            fprintf(logp, "%s - %s: %s\n", date_fmt, other_copy, msg);
+            fprintf(logp, "%s - %s: %s\n", date_fmt, other, msg);
         }
     } else {
         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);
             dated_log->date = NULL;
         }
+        free(dated_log);
     }
-    dated_log = NULL;
 }
 
 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");
     g_string_append(log_file, date);
+    g_free(date);
 
     char *result = strdup(log_file->str);
     g_string_free(log_file, TRUE);
-- 
cgit 1.4.1-2-gfad0

f='/akkartik/mu/blame/?h=main&amp;id=2d4c3296d8aec3d8ec6dbc83bdc59f2f8c2fad04'>root</a>/<a href='/akkartik/mu/blame/new_lesson?h=main&amp;id=2d4c3296d8aec3d8ec6dbc83bdc59f2f8c2fad04'>new_lesson</a></div><div class='content'>blob: 3642b8233c22ca952693006ddd2ae4cd6f491aea (<a href='/akkartik/mu/plain/new_lesson?h=main&amp;id=2d4c3296d8aec3d8ec6dbc83bdc59f2f8c2fad04'>plain</a>) (<a href='/akkartik/mu/tree/new_lesson?h=main&amp;id=2d4c3296d8aec3d8ec6dbc83bdc59f2f8c2fad04'>tree</a>)
<table class='blame blob'>
<tr>
<td class='hashes'><div class='alt'><pre><span class='oid'><a title='author  Kartik K. Agaram &lt;vc@akkartik.com&gt;  2016-10-06 21:49:21 -0700
committer  Kartik K. Agaram &lt;vc@akkartik.com&gt;  2016-10-06 21:49:26 -0700

3455' href='/akkartik/mu/commit/new_lesson?h=main&amp;id=924253f1a5b8cdaa3ab301d752b9bdf855d6a0f9'>924253f1</a></span> <a title='Blame the previous revision' href='/akkartik/mu/blame/new_lesson?h=main&amp;id=6ff112a15d213bb955195e488aaa7384dcf9049e'>^</a>
</pre></div><div class='alt'><pre><span class='oid'><a title='author  Kartik K. Agaram &lt;vc@akkartik.com&gt;  2016-10-22 16:56:07 -0700
committer  Kartik K. Agaram &lt;vc@akkartik.com&gt;  2016-10-22 16:56:07 -0700

3561' href='/akkartik/mu/commit/new_lesson?h=main&amp;id=9a81d7460fdb16f4e77712e5381d9db8781f5ae6'>9a81d746</a></span> <a title='Blame the previous revision' href='/akkartik/mu/blame/new_lesson?h=main&amp;id=22f4b76344b2d639cbfcaad56ed681670d436548'>^</a>

</pre></div><div class='alt'><pre><span class='oid'><a title='author  Kartik K. Agaram &lt;vc@akkartik.com&gt;  2016-05-21 11:00:33 -0700
committer  Kartik K. Agaram &lt;vc@akkartik.com&gt;  2016-05-21 11:00:33 -0700

2995' href='/akkartik/mu/commit/new_lesson?h=main&amp;id=61c025b11ed4ddd002f09f061fd77c75d8b6d0ba'>61c025b1</a></span> <a title='Blame the previous revision' href='/akkartik/mu/blame/new_lesson?h=main&amp;id=395e2128a4155549a08dfcea47db7a5f7d8b2005'>^</a>








</pre></div><div class='alt'><pre><span class='oid'><a title='author  Kartik K. Agaram &lt;vc@akkartik.com&gt;  2016-08-29 15:42:43 -0700
committer  Kartik K. Agaram &lt;vc@akkartik.com&gt;  2016-08-29 15:42:43 -0700

3280' href='/akkartik/mu/commit/new_lesson?h=main&amp;id=45912cf8c7ffa429eab1dfb66b8851752ae7ff27'>45912cf8</a></span> <a title='Blame the previous revision' href='/akkartik/mu/blame/new_lesson?h=main&amp;id=d41955c10821fc8f435173efe8cd355cc3693801'>^</a>
</pre></div><div class='alt'><pre><span class='oid'><a title='author  Kartik K. Agaram &lt;vc@akkartik.com&gt;  2016-05-21 11:00:33 -0700
committer  Kartik K. Agaram &lt;vc@akkartik.com&gt;  2016-05-21 11:00:33 -0700

2995' href='/akkartik/mu/commit/new_lesson?h=main&amp;id=61c025b11ed4ddd002f09f061fd77c75d8b6d0ba'>61c025b1</a></span> <a title='Blame the previous revision' href='/akkartik/mu/blame/new_lesson?h=main&amp;id=395e2128a4155549a08dfcea47db7a5f7d8b2005'>^</a>

</pre></div></td>
<td class='linenumbers'><div class='alt'><pre><a id='n1' href='#n1'>1</a>
</pre></div><div class='alt'><pre><a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
</pre></div><div class='alt'><pre><a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
</pre></div><div class='alt'><pre><a id='n13' href='#n13'>13</a>
</pre></div><div class='alt'><pre><a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
</pre></div></td>
<td class='lines'><div><div><div class='alt'><pre>
         </pre></div><div class='alt'><pre>

                                                                              </pre></div><div class='alt'><pre>








                                                                           </pre></div><div class='alt'><pre>
                             </pre></div><div class='alt'><pre>

               </pre></div></div><pre><code>