[PATCH] _notmuch_message_index_file: unref (free) address lists from gmime.

diff --git a/75/862cfff413a7f5ab4efbcbf93399c7c08dbb35 b/75/862cfff413a7f5ab4efbcbf93399c7c08dbb35
new file mode 100644 (file)
index 0000000..cb3c448
--- /dev/null
+++ b/75/862cfff413a7f5ab4efbcbf93399c7c08dbb35
@@ -0,0 +1,96 @@
+Return-Path: <bremner@tethera.net>\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 AB06F431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 10 Dec 2012 19:35:08 -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 eJS4H4iTyBEm for <notmuch@notmuchmail.org>;\r
+       Mon, 10 Dec 2012 19:35:08 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 08044431FAE\r
+       for <notmuch@notmuchmail.org>; Mon, 10 Dec 2012 19:35:07 -0800 (PST)\r
+Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([142.167.90.129] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TiGcb-0000gD-08; Mon, 10 Dec 2012 23:35:06 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TiGcV-0007ki-Fq; Mon, 10 Dec 2012 23:34:59 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] _notmuch_message_index_file: unref (free) address lists from\r
+       gmime.\r
+Date: Mon, 10 Dec 2012 23:33:40 -0400\r
+Message-Id: <1355196820-29734-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\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
+X-Spam_bar: -\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 03:35:08 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+Apparently as of GMime 2.4, you don't need to call\r
+internet_address_list_destroy anymore, but you still need to call\r
+g_object_unref (from the GMime Changelog).\r
+\r
+On the medium performance corpus, valgrind shows "possibly lost"\r
+leakage in "notmuch new" dropping from 7M to 300k.\r
+---\r
+ lib/index.cc |   12 +++++++++---\r
+ 1 file changed, 9 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/lib/index.cc b/lib/index.cc\r
+index da0e6ce..a2edd6d 100644\r
+--- a/lib/index.cc\r
++++ b/lib/index.cc\r
+@@ -484,12 +484,18 @@ mboxes is deprecated and may be removed in the future.\n", filename);\r
+     }\r
+ \r
+     from = g_mime_message_get_sender (mime_message);\r
+-    addresses = internet_address_list_parse_string (from);\r
+ \r
+-    _index_address_list (message, "from", addresses);\r
++    addresses = internet_address_list_parse_string (from);\r
++    if (addresses) {\r
++      _index_address_list (message, "from", addresses);\r
++      g_object_unref (addresses);\r
++    }\r
+ \r
+     addresses = g_mime_message_get_all_recipients (mime_message);\r
+-    _index_address_list (message, "to", addresses);\r
++    if (addresses) {\r
++      _index_address_list (message, "to", addresses);\r
++      g_object_unref (addresses);\r
++    }\r
+ \r
+     subject = g_mime_message_get_subject (mime_message);\r
+     _notmuch_message_gen_terms (message, "subject", subject);\r
+-- \r
+1.7.10.4\r
+\r