Re: [PATCH] lib/message.cc: stale pointer bug (v3)

diff --git a/4b/f90a60f639af6a38b22f59f5f2d6236daec258 b/4b/f90a60f639af6a38b22f59f5f2d6236daec258
new file mode 100644 (file)
index 0000000..4a16866
--- /dev/null
+++ b/4b/f90a60f639af6a38b22f59f5f2d6236daec258
@@ -0,0 +1,120 @@
+Return-Path: <jani@nikula.org>\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 2DF10431FB6\r
+       for <notmuch@notmuchmail.org>; Thu,  2 May 2013 09:20:42 -0700 (PDT)\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 x5Pj5WEZ1RU6 for <notmuch@notmuchmail.org>;\r
+       Thu,  2 May 2013 09:20:38 -0700 (PDT)\r
+Received: from mail-la0-f46.google.com (mail-la0-f46.google.com\r
+       [209.85.215.46]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id C1201431FAF\r
+       for <notmuch@notmuchmail.org>; Thu,  2 May 2013 09:20:37 -0700 (PDT)\r
+Received: by mail-la0-f46.google.com with SMTP id fk20so702834lab.33\r
+       for <notmuch@notmuchmail.org>; Thu, 02 May 2013 09:20:36 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:in-reply-to:references:user-agent\r
+       :date:message-id:mime-version:content-type:x-gm-message-state;\r
+       bh=Kbig8zRFV5QxiiFKLAkpnX13r00hHw7FkgqoUoTMZF8=;\r
+       b=VkOeMKJB8Tc3slhtvA2HfMAmbz2OlbDluD4X2Rtgz4DZ4JBh5rqCef3gQ1hNC+oI0Z\r
+       fqcEl7rxzmAH4xXFkiXz+wj7/g63sQadjhr3PX+OygkbmWHDkbv8bVYVfn+ZtR4kBLk3\r
+       UNiKF5Kk2FjvdHmhQSyf/JawDPBPK5WXuKuEXGH1TnyaD8AMzZFrtVBzYOqbp56aqyW5\r
+       KFQE0hHADzTVfFZhT8zxbKSw0baqHRt39Ke/sVr2aA3YpVR17kutcboHElmcfCzruNgw\r
+       lIc0B1WuH6DqNN/rBxaSa4IwnlL3waN8+lZh9x/CV7/Co3UyogwqVdxeJ3IwqYpVjdD3\r
+       7wrA==\r
+X-Received: by 10.152.6.229 with SMTP id e5mr2468033laa.6.1367511636197;\r
+       Thu, 02 May 2013 09:20:36 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c376-211.dhcp.inet.fi.\r
+       [88.195.118.211])\r
+       by mx.google.com with ESMTPSA id r9sm2970061lbr.3.2013.05.02.09.20.34\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Thu, 02 May 2013 09:20:35 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Vladimir.Marek@oracle.com, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] lib/message.cc: stale pointer bug (v3)\r
+In-Reply-To: <1367505102-12860-1-git-send-email-Vladimir.Marek@oracle.com>\r
+References: <1367505102-12860-1-git-send-email-Vladimir.Marek@oracle.com>\r
+User-Agent: Notmuch/0.15.2+70~g2eeb96a (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Thu, 02 May 2013 19:20:30 +0300\r
+Message-ID: <87ppx94alt.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-Gm-Message-State:\r
+ ALoCoQmYutxrV69Xb5RCUw7L15OCv4aoorjKzUkmv2EWs2x8XEwvHFQeLRIrgjmNLZWUGkrz3Pku\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 16:20:42 -0000\r
+\r
+\r
+LGTM\r
+\r
+On Thu, 02 May 2013, Vladimir.Marek@oracle.com wrote:\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
+> Signed-off-by: Vladimir Marek <vlmarek@volny.cz>\r
+> ---\r
+>  lib/message.cc |   10 +++++-----\r
+>  1 file changed, 5 insertions(+), 5 deletions(-)\r
+>\r
+> diff --git a/lib/message.cc b/lib/message.cc\r
+> index 8720c1b..c4261e6 100644\r
+> --- a/lib/message.cc\r
+> +++ b/lib/message.cc\r
+> @@ -266,18 +266,18 @@ _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
+>      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
+> +    std::string term = *i;\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