Re: [PATCH] lib: fix memory leak of field processor objects

diff --git a/05/b5f869282da75dd94114172d5b84b13d2b848e b/05/b5f869282da75dd94114172d5b84b13d2b848e
new file mode 100644 (file)
index 0000000..672d5df
--- /dev/null
+++ b/05/b5f869282da75dd94114172d5b84b13d2b848e
@@ -0,0 +1,84 @@
+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 arlo.cworth.org (Postfix) with ESMTP id 083686DE02B0\r
+ for <notmuch@notmuchmail.org>; Fri, 10 Jun 2016 04:13:45 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.571\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.571 tagged_above=-999 required=5 tests=[AWL=-0.081,\r
+  SPF_NEUTRAL=0.652] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 4cST341FF9gt for <notmuch@notmuchmail.org>;\r
+ Fri, 10 Jun 2016 04:13:37 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id D17716DE0222\r
+ for <notmuch@notmuchmail.org>; Fri, 10 Jun 2016 04:13:36 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 9BE48100104;\r
+ Fri, 10 Jun 2016 14:13:26 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] lib: fix memory leak of field processor objects\r
+In-Reply-To: <1465526268-9522-1-git-send-email-david@tethera.net>\r
+References: <1465526268-9522-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.22+32~gd4854c5 (http://notmuchmail.org) Emacs/24.5.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: Fri, 10 Jun 2016 14:13:26 +0300\r
+Message-ID: <m2oa79thyh.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 10 Jun 2016 11:13:45 -0000\r
+\r
+On Fri, Jun 10 2016, David Bremner <david@tethera.net> wrote:\r
+\r
+> The field processor objects need to be deallocated explicitly just like\r
+> the range processors (or a talloc destructor defined).\r
+> ---\r
+>  lib/database.cc | 7 +++++++\r
+>  1 file changed, 7 insertions(+)\r
+>\r
+> diff --git a/lib/database.cc b/lib/database.cc\r
+> index 2b2d821..afafe88 100644\r
+> --- a/lib/database.cc\r
+> +++ b/lib/database.cc\r
+> @@ -1107,6 +1107,13 @@ notmuch_database_close (notmuch_database_t *notmuch)\r
+>      delete notmuch->last_mod_range_processor;\r
+>      notmuch->last_mod_range_processor = NULL;\r
+>  \r
+> +#if HAVE_XAPIAN_FIELD_PROCESSOR\r
+> +    delete notmuch->date_field_processor;\r
+> +    notmuch->date_field_processor = NULL;\r
+> +    delete notmuch->query_field_processor;\r
+> +    notmuch->query_field_processor = NULL;\r
+> +#endif\r
+> +\r
+\r
+... ok, it was this I marked trivial and not the one I wrote in\r
+id:m2r3c5ti1c.fsf@guru.guru-group.fi (the same thought about triviality may\r
+apply, though)\r
+\r
+\r
+>      return status;\r
+>  }\r
+>  \r
+> -- \r
+> 2.8.1\r