1 Return-Path: <teythoon@jade-hamburg.de>
\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 897A1431FDA
\r
6 for <notmuch@notmuchmail.org>; Sat, 17 Mar 2012 09:42:52 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id Tx5zwxqTc-n2 for <notmuch@notmuchmail.org>;
\r
16 Sat, 17 Mar 2012 09:42:50 -0700 (PDT)
\r
17 Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])
\r
18 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id DECAA431FC4
\r
21 for <notmuch@notmuchmail.org>; Sat, 17 Mar 2012 09:42:47 -0700 (PDT)
\r
22 Received: from mail.jade-hamburg.de (unknown [85.183.11.228])
\r
23 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
\r
24 (No client certificate requested)
\r
25 by mail.cryptobitch.de (Postfix) with ESMTPSA id 46290329F52
\r
26 for <notmuch@notmuchmail.org>; Sat, 17 Mar 2012 17:42:46 +0100 (CET)
\r
27 Received: by mail.jade-hamburg.de (Postfix, from userid 401)
\r
28 id BD178DF2A2; Sat, 17 Mar 2012 17:42:45 +0100 (CET)
\r
29 Received: from thinkbox.jade-hamburg.de (unknown [10.1.1.153])
\r
30 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
31 (No client certificate requested) (Authenticated sender: teythoon)
\r
32 by mail.jade-hamburg.de (Postfix) with ESMTPSA id B733EDF2A1;
\r
33 Sat, 17 Mar 2012 17:42:40 +0100 (CET)
\r
34 Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)
\r
35 (envelope-from <teythoon@thinkbox.jade-hamburg.de>)
\r
36 id 1S8whF-0008Ru-2b; Sat, 17 Mar 2012 17:41:37 +0100
\r
37 From: Justus Winter <4winter@informatik.uni-hamburg.de>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH] Fix error reporting in
\r
40 notmuch_database_find_message_by_filename
\r
41 Date: Sat, 17 Mar 2012 17:41:27 +0100
\r
43 <1332002487-32411-2-git-send-email-4winter@informatik.uni-hamburg.de>
\r
44 X-Mailer: git-send-email 1.7.9.1
\r
46 <1332002487-32411-1-git-send-email-4winter@informatik.uni-hamburg.de>
\r
48 <1332002487-32411-1-git-send-email-4winter@informatik.uni-hamburg.de>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Sat, 17 Mar 2012 16:42:53 -0000
\r
63 Formerly it was possible for *message_ret to be left
\r
64 uninitialized. The documentation however clearly states that "[o]n any
\r
65 failure or when the message is not found, this function initializes
\r
66 '*message' to NULL".
\r
68 Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
\r
70 lib/database.cc | 3 +++
\r
71 1 files changed, 3 insertions(+), 0 deletions(-)
\r
73 diff --git a/lib/database.cc b/lib/database.cc
\r
74 index 8f8df1a..16c4354 100644
\r
75 --- a/lib/database.cc
\r
76 +++ b/lib/database.cc
\r
77 @@ -1825,6 +1825,9 @@ notmuch_database_find_message_by_filename (notmuch_database_t *notmuch,
\r
78 if (message_ret == NULL)
\r
79 return NOTMUCH_STATUS_NULL_POINTER;
\r
81 + /* return NULL on any failure */
\r
82 + *message_ret = NULL;
\r
84 local = talloc_new (notmuch);
\r