Re: [PATCH] notmuch_message_file_get_header: replace free with g_free

diff --git a/94/65c2324f6928a6890e0420d94735ef2aea7aec b/94/65c2324f6928a6890e0420d94735ef2aea7aec
new file mode 100644 (file)
index 0000000..2144ad3
--- /dev/null
+++ b/94/65c2324f6928a6890e0420d94735ef2aea7aec
@@ -0,0 +1,135 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id EEBAF431FBC\r
+       for <notmuch@notmuchmail.org>; Mon, 10 Dec 2012 20:51:00 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 9ijrhsgKAGjp for <notmuch@notmuchmail.org>;\r
+       Mon, 10 Dec 2012 20:50:57 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 71D9B431FB6\r
+       for <notmuch@notmuchmail.org>; Mon, 10 Dec 2012 20:50:55 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id CB7A110007E;\r
+       Tue, 11 Dec 2012 06:50:49 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] notmuch_message_file_get_header: replace free with g_free\r
+In-Reply-To: <1355188740-6663-1-git-send-email-david@tethera.net>\r
+References: <1355188740-6663-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.14+116~g29fcdb5 (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Tue, 11 Dec 2012 06:50:49 +0200\r
+Message-ID: <m2a9tlfaza.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 11 Dec 2012 04:51:01 -0000\r
+\r
+On Tue, Dec 11 2012, david@tethera.net wrote:\r
+\r
+> From: David Bremner <bremner@debian.org>\r
+>\r
+> The pointer returned by g_mime_utils_header_decode_text is from the\r
+> following line in rfc2047_decode_tokens\r
+>\r
+>      return g_string_free (decoded, FALSE);\r
+>\r
+> The docs for g_string_free say\r
+>\r
+>  Frees the memory allocated for the GString. If free_segment is TRUE\r
+>  it also frees the character data. If it's FALSE, the caller gains\r
+>  ownership of the buffer and must free it after use with g_free().\r
+> ---\r
+\r
+There is still some problem left: in the contex one can see the following\r
+calls:\r
+\r
+   g_hash_table_insert (message->headers, header, decoded_value);\r
+\r
+and then\r
+\r
+   combined_header = xmalloc(hdrsofar + newhdr + 2);\r
+   strncpy(combined_header,header_sofar,hdrsofar);\r
+   *(combined_header+hdrsofar) = ' ';\r
+   strncpy(combined_header+hdrsofar+1,decoded_value,newhdr+1);\r
+   g_free (decoded_value);\r
+   g_hash_table_insert (message->headers, header, combined_header);\r
+\r
+Now, decoded_value should always be freed with g_free() and combined_header\r
+with free(), note also that the hash table is initialized with:\r
+\r
+   message->headers = g_hash_table_new_full (strcase_hash,\r
+                                             strcase_equal,\r
+                                             free,\r
+                                             free);\r
+\r
+i.e. finally the allocated string is freed with free() (in case\r
+we're freeing... I did not look so far...).\r
+\r
+Maybe all allocations and frees in the values of this header hash table\r
+should be converted to use g_ -functions ? (or start to use talloc contex\r
+there)\r
+\r
+\r
+Tomi\r
+\r
+\r
+\r
+\r
+\r
+>  lib/message-file.c |    4 ++--\r
+>  1 file changed, 2 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/lib/message-file.c b/lib/message-file.c\r
+> index 915aba8..976769d 100644\r
+> --- a/lib/message-file.c\r
+> +++ b/lib/message-file.c\r
+> @@ -341,7 +341,7 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,\r
+>              strncpy(combined_header,header_sofar,hdrsofar);\r
+>              *(combined_header+hdrsofar) = ' ';\r
+>              strncpy(combined_header+hdrsofar+1,decoded_value,newhdr+1);\r
+> -            free (decoded_value);\r
+> +            g_free (decoded_value);\r
+>              g_hash_table_insert (message->headers, header, combined_header);\r
+>          }\r
+>      } else {\r
+> @@ -350,7 +350,7 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,\r
+>              g_hash_table_insert (message->headers, header, decoded_value);\r
+>          } else {\r
+>              free (header);\r
+> -            free (decoded_value);\r
+> +            g_free (decoded_value);\r
+>              decoded_value = header_sofar;\r
+>          }\r
+>      }\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r