--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 D9166431FAF\r
+ for <notmuch@notmuchmail.org>; Mon, 24 Dec 2012 12:46:45 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 e5Ekfit9uaFs for <notmuch@notmuchmail.org>;\r
+ Mon, 24 Dec 2012 12:46:45 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+ [18.7.68.36])\r
+ by olra.theworths.org (Postfix) with ESMTP id 0ED18431FAE\r
+ for <notmuch@notmuchmail.org>; Mon, 24 Dec 2012 12:46:44 -0800 (PST)\r
+X-AuditID: 12074424-b7f4e6d0000004ca-5e-50d8bf349eb8\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 45.F7.01226.43FB8D05; Mon, 24 Dec 2012 15:46:44 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id qBOKkiA4013446; \r
+ Mon, 24 Dec 2012 15:46:44 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBOKke1s028518\r
+ (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
+ Mon, 24 Dec 2012 15:46:41 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1TnEv2-0008QF-JE; Mon, 24 Dec 2012 15:46:40 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/1] lib/message-file.c: use g_malloc () & g_free () in\r
+ hash table values\r
+In-Reply-To: <1356112321-6332-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <1356112321-6332-1-git-send-email-tomi.ollila@iki.fi>\r
+User-Agent: Notmuch/0.14+236~gf64406d (http://notmuchmail.org) Emacs/23.4.1\r
+ (i486-pc-linux-gnu)\r
+Date: Mon, 24 Dec 2012 15:46:40 -0500\r
+Message-ID: <87r4mfkwjz.fsf@awakening.csail.mit.edu>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsUixCmqrWuy/0aAwZt5ahbXb85ktnizch6r\r
+ A5PH4a8LWTyerbrFHMAUxWWTkpqTWZZapG+XwJXxrqmHteC4SMWFjdOYGxhXCXQxcnBICJhI\r
+ tBzm7GLkBDLFJC7cW8/WxcjFISSwj1Fi3emXUM4GRoklC5YyQjgXmSR+HlvJDOEsYZRYseca\r
+ G0g/m4CGxLb9yxlBbBEBW4krS06ygqxgBprbPi8EJCwsECvReH8tG0iYU8BJ4vkESZCwkICj\r
+ RMfkqywgtqhAvMTze9/AbBYBVYn/D94xgdi8QIfeuriLFcIWlDg58wlYDbOAlsSNfy+ZJjAK\r
+ zkKSmoUktYCRaRWjbEpulW5uYmZOcWqybnFyYl5eapGuuV5uZoleakrpJkZQmLK7qOxgbD6k\r
+ dIhRgINRiYe3YPKNACHWxLLiytxDjJIcTEqivL67gEJ8SfkplRmJxRnxRaU5qcWHGCU4mJVE\r
+ eLnXAeV4UxIrq1KL8mFS0hwsSuK811Nu+gsJpCeWpGanphakFsFkZTg4lCR4lfcBNQoWpaan\r
+ VqRl5pQgpJk4OEGG8wANzwKp4S0uSMwtzkyHyJ9iVJQS5xUASQiAJDJK8+B6YWnkFaM40CvC\r
+ vG4gVTzAFATX/QpoMBPQ4Fg+sMEliQgpqQbGWPYTK/c2Z9j8277rBoOfybGTZw94Clw38qw+\r
+ 5Bdz4ujVN3PY1s8PYF7UFDaV99d08d+HI6WfXGG8US4r+r370ZN0S/clS+49496SVLNi/m0t\r
+ y6MZE7ZeLJR88mLxeaEpTmzlc18Exka7y/sE33iyNob3iezPEJGr3V0bfzM5WnBNEr23Seyb\r
+ phJLcUaioRZzUXEiAO5Esxf+AgAA\r
+Cc: tomi.ollila@iki.fi\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: Mon, 24 Dec 2012 20:46:46 -0000\r
+\r
+LGTM.\r
+\r
+On Fri, 21 Dec 2012, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
+> The message->headers hash table values get data returned by\r
+> g_mime_utils_header_decode_text ().\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
+> The remaining frees and allocations referencing to message->headers hash\r
+> values have been changed to use g_free and g_malloc functions.\r
+>\r
+> This combines and completes the changes started by David Bremner.\r
+> ---\r
+>\r
+> This was meant to be in reply to id:87mwxkptqn.fsf@zancas.localnet\r
+> but I fumbled it. ;)\r
+>\r
+> lib/message-file.c | 8 ++++----\r
+> 1 file changed, 4 insertions(+), 4 deletions(-)\r
+>\r
+> diff --git a/lib/message-file.c b/lib/message-file.c\r
+> index 915aba8..4d9af89 100644\r
+> --- a/lib/message-file.c\r
+> +++ b/lib/message-file.c\r
+> @@ -111,7 +111,7 @@ _notmuch_message_file_open_ctx (void *ctx, const char *filename)\r
+> message->headers = g_hash_table_new_full (strcase_hash,\r
+> strcase_equal,\r
+> free,\r
+> - free);\r
+> + g_free);\r
+> \r
+> message->parsing_started = 0;\r
+> message->parsing_finished = 0;\r
+> @@ -337,11 +337,11 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,\r
+> /* we need to add the header to those we already collected */\r
+> newhdr = strlen(decoded_value);\r
+> hdrsofar = strlen(header_sofar);\r
+> - combined_header = xmalloc(hdrsofar + newhdr + 2);\r
+> + combined_header = g_malloc(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
+> - 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.8.0\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff