1 Return-Path: <Vladimir.Marek@oracle.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 91465431FB6
\r
6 for <notmuch@notmuchmail.org>; Fri, 19 Apr 2013 14:14:40 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.299 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3, UNPARSEABLE_RELAY=0.001]
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id c0exDw3deh-l for <notmuch@notmuchmail.org>;
\r
17 Fri, 19 Apr 2013 14:14:40 -0700 (PDT)
\r
18 Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81])
\r
19 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id E3E13431FAE
\r
22 for <notmuch@notmuchmail.org>; Fri, 19 Apr 2013 14:14:39 -0700 (PDT)
\r
23 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93])
\r
24 by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with
\r
25 ESMTP id r3JLEbwO021731
\r
26 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
\r
27 Fri, 19 Apr 2013 21:14:38 GMT
\r
28 Received: from aserz7021.oracle.com (aserz7021.oracle.com [141.146.126.230])
\r
29 by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id
\r
31 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL);
\r
32 Fri, 19 Apr 2013 21:14:37 GMT
\r
33 Received: from abhmt118.oracle.com (abhmt118.oracle.com [141.146.116.70])
\r
34 by aserz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id
\r
35 r3JLEa8J014693; Fri, 19 Apr 2013 21:14:36 GMT
\r
36 Received: from pub.cz.oracle.com (/10.163.101.122)
\r
37 by default (Oracle Beehive Gateway v4.0)
\r
38 with ESMTP ; Fri, 19 Apr 2013 14:14:36 -0700
\r
39 From: Vladimir.Marek@oracle.com
\r
40 To: notmuch@notmuchmail.org
\r
41 Subject: [PATCH] don't store temporary value returned from c_str()
\r
42 Date: Fri, 19 Apr 2013 23:12:13 +0200
\r
43 Message-Id: <1366405933-17223-1-git-send-email-Vladimir.Marek@oracle.com>
\r
44 X-Mailer: git-send-email 1.7.3.2
\r
45 X-Source-IP: ucsinet21.oracle.com [156.151.31.93]
\r
46 Cc: Vladimir Marek <vlmarek@volny.cz>
\r
47 X-BeenThere: notmuch@notmuchmail.org
\r
48 X-Mailman-Version: 2.1.13
\r
50 List-Id: "Use and development of the notmuch mail system."
\r
51 <notmuch.notmuchmail.org>
\r
52 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
54 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
55 List-Post: <mailto:notmuch@notmuchmail.org>
\r
56 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
57 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
58 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
59 X-List-Received-Date: Fri, 19 Apr 2013 21:14:40 -0000
\r
61 From: Vladimir Marek <vlmarek@volny.cz>
\r
63 This is causing problems when compiled by Oracle Studio. Memory pointed
\r
64 by (const char*)term was already changed once talloc_strdup was called.
\r
66 Signed-off-by: Vladimir Marek <vlmarek@volny.cz>
\r
68 lib/message.cc | 9 ++++-----
\r
69 1 files changed, 4 insertions(+), 5 deletions(-)
\r
71 diff --git a/lib/message.cc b/lib/message.cc
\r
72 index 8720c1b..8d329d1 100644
\r
73 --- a/lib/message.cc
\r
74 +++ b/lib/message.cc
\r
75 @@ -266,18 +266,17 @@ _notmuch_message_get_term (notmuch_message_t *message,
\r
78 int prefix_len = strlen (prefix);
\r
79 - const char *term = NULL;
\r
85 - term = (*i).c_str ();
\r
89 - if (!term || strncmp (term, prefix, prefix_len))
\r
90 + if (strncmp ((*i).c_str(), prefix, prefix_len))
\r
93 - value = talloc_strdup (message, term + prefix_len);
\r
94 + value = talloc_strdup (message, (*i).c_str() + prefix_len);
\r
96 #if DEBUG_DATABASE_SANITY
\r