Re: [PATCH 01/24] lib/message.cc: stale pointer bug

diff --git a/f0/db720e680c462d2cad1417773d2ce7550002df b/f0/db720e680c462d2cad1417773d2ce7550002df
new file mode 100644 (file)
index 0000000..308a7c1
--- /dev/null
+++ b/f0/db720e680c462d2cad1417773d2ce7550002df
@@ -0,0 +1,109 @@
+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 41F9F431FB6\r
+       for <notmuch@notmuchmail.org>; Thu,  2 May 2013 03:01:54 -0700 (PDT)\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 Bq6-9iWzF6Ui for <notmuch@notmuchmail.org>;\r
+       Thu,  2 May 2013 03:01:50 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9C103431FAF\r
+       for <notmuch@notmuchmail.org>; Thu,  2 May 2013 03:01:50 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 336B5100044;\r
+       Thu,  2 May 2013 13:01:48 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Vladimir.Marek@oracle.com, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 01/24] lib/message.cc: stale pointer bug\r
+In-Reply-To: <1367444021-2757-1-git-send-email-Vladimir.Marek@oracle.com>\r
+References: <1367444021-2757-1-git-send-email-Vladimir.Marek@oracle.com>\r
+User-Agent: Notmuch/0.15.2+75~gd7fa7c4 (http://notmuchmail.org) Emacs/24.3.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: Thu, 02 May 2013 13:01:47 +0300\r
+Message-ID: <m2sj25snsk.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+Cc: Vladimir Marek <vlmarek@volny.cz>\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: Thu, 02 May 2013 10:01:54 -0000\r
+\r
+On Thu, May 02 2013, Vladimir.Marek@oracle.com wrote:\r
+\r
+> From: Vladimir Marek <vlmarek@volny.cz>\r
+>\r
+> Xapian::TermIterator::operator* returns std::string which is destroyed\r
+> as soon as (*i).c_str() finishes. The remembered pointer 'term' then\r
+> references invalid memory.\r
+\r
+Looks to me like a good solution...\r
+\r
+\r
+Tomi\r
+\r
+>\r
+> Signed-off-by: Vladimir Marek <vlmarek@volny.cz>\r
+> ---\r
+>  lib/message.cc |   11 ++++++-----\r
+>  1 file changed, 6 insertions(+), 5 deletions(-)\r
+>\r
+> diff --git a/lib/message.cc b/lib/message.cc\r
+> index 8720c1b..a890550 100644\r
+> --- a/lib/message.cc\r
+> +++ b/lib/message.cc\r
+> @@ -266,18 +266,19 @@ _notmuch_message_get_term (notmuch_message_t *message,\r
+>                         const char *prefix)\r
+>  {\r
+>      int prefix_len = strlen (prefix);\r
+> -    const char *term = NULL;\r
+> +    std::string term;\r
+>      char *value;\r
+>  \r
+>      i.skip_to (prefix);\r
+>  \r
+> -    if (i != end)\r
+> -    term = (*i).c_str ();\r
+> +    if (i == end)\r
+> +    return NULL;\r
+>  \r
+> -    if (!term || strncmp (term, prefix, prefix_len))\r
+> +    term = *i;\r
+\r
+... hmm, a raii(?) solution above would be std::string term = *i;\r
+\r
+> +    if (strncmp (term.c_str(), prefix, prefix_len))\r
+>      return NULL;\r
+>  \r
+> -    value = talloc_strdup (message, term + prefix_len);\r
+> +    value = talloc_strdup (message, term.c_str() + prefix_len);\r
+>  \r
+>  #if DEBUG_DATABASE_SANITY\r
+>      i++;\r
+> -- \r
+> 1.7.9.2\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r