1 Return-Path: <amdragon@mit.edu>
\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 1E644431FAF
\r
6 for <notmuch@notmuchmail.org>; Mon, 7 Jan 2013 13:20:54 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\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 BegcVXD4ELgN for <notmuch@notmuchmail.org>;
\r
16 Mon, 7 Jan 2013 13:20:53 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id 79FC5431FAE
\r
20 for <notmuch@notmuchmail.org>; Mon, 7 Jan 2013 13:20:53 -0800 (PST)
\r
21 X-AuditID: 1209190d-b7efd6d000001a82-c2-50eb3c353039
\r
22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])
\r
23 by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id 5E.6C.06786.53C3BE05; Mon, 7 Jan 2013 16:20:53 -0500 (EST)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id r07LKqOO030143;
\r
27 Mon, 7 Jan 2013 16:20:52 -0500
\r
28 Received: from drake.dyndns.org (a069.catapulsion.net [70.36.81.69])
\r
29 (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id r07LKnXq004005
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Mon, 7 Jan 2013 16:20:51 -0500 (EST)
\r
34 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)
\r
35 (envelope-from <amdragon@mit.edu>)
\r
36 id 1TsK7k-0008Ms-CQ; Mon, 07 Jan 2013 16:20:48 -0500
\r
37 From: Austin Clements <amdragon@MIT.EDU>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH] string-util: Disallow empty prefixes in parse_boolean_term
\r
40 Date: Mon, 7 Jan 2013 16:20:40 -0500
\r
41 Message-Id: <1357593640-32122-1-git-send-email-amdragon@mit.edu>
\r
42 X-Mailer: git-send-email 1.7.10.4
\r
43 X-Brightmail-Tracker:
\r
44 H4sIAAAAAAAAA+NgFlrEIsWRmVeSWpSXmKPExsUixCmqrGtq8zrAYMcONoum6c4W12/OZHZg
\r
45 8rh1/zW7x7NVt5gDmKK4bFJSczLLUov07RK4MvbuPcJesIG1Yu3zU0wNjBNZuhg5OSQETCR6
\r
46 33UyQthiEhfurWfrYuTiEBLYxyjR9fwoO4SznlGi4dwlJghnP5PE8g8/oMrmMko877rJDtLP
\r
47 JqAhsW3/crBZIgLSEjvvzmbtYuTgYBYwl7jZEtfFyM4hLOAtMV0IpIBFQFViz55JYI28Ag4S
\r
48 m85eZII4QlGi+9kEtgmMvAsYGVYxyqbkVunmJmbmFKcm6xYnJ+blpRbpGunlZpbopaaUbmIE
\r
49 B4Uk7w7GdweVDjEKcDAq8fC+dH0VIMSaWFZcmXuIUZKDSUmUd5Xl6wAhvqT8lMqMxOKM+KLS
\r
50 nNTiQ4wSHMxKIrzfHgCV86YkVlalFuXDpKQ5WJTEea+k3PQXEkhPLEnNTk0tSC2CycpwcChJ
\r
51 8MpZAw0VLEpNT61Iy8wpQUgzcXCCDOcBGu4NUsNbXJCYW5yZDpE/xagoJc7rBZIQAElklObB
\r
52 9cKi9hWjONArwrzaIFU8wIiH634FNJgJaHDq4+cgg0sSEVJSDYxyFoHbN1bfnZJwczpfZzcf
\r
53 BwfL7uz1nxg2pP6o++lyY7ai/Il5h0W8HBYekVt54lmtu3o/x9TUxB9fw+qEH7VG1pgHnWFN
\r
54 +dUy5VWk4XXdaW0cujusGrf7rgr1+vD1T2PZPVbF0/cunDy5JOiGU21SW1mKhfyyzlUFz/OK
\r
55 7W/2nSl2exUgv1GJpTgj0VCLuag4EQCnzOVvtQIAAA==
\r
56 X-BeenThere: notmuch@notmuchmail.org
\r
57 X-Mailman-Version: 2.1.13
\r
59 List-Id: "Use and development of the notmuch mail system."
\r
60 <notmuch.notmuchmail.org>
\r
61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
62 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
64 List-Post: <mailto:notmuch@notmuchmail.org>
\r
65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
67 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
68 X-List-Received-Date: Mon, 07 Jan 2013 21:20:54 -0000
\r
70 Xapian doesn't consider ":abc" to be a prefixed term. This makes
\r
71 parse_boolean_term similarly reject queries with an empty prefix.
\r
73 util/string-util.c | 2 +-
\r
74 1 file changed, 1 insertion(+), 1 deletion(-)
\r
76 diff --git a/util/string-util.c b/util/string-util.c
\r
77 index aba9aa8..a5622d7 100644
\r
78 --- a/util/string-util.c
\r
79 +++ b/util/string-util.c
\r
80 @@ -127,7 +127,7 @@ parse_boolean_term (void *ctx, const char *str,
\r
82 str = skip_space (str);
\r
83 const char *pos = strchr (str, ':');
\r
85 + if (! pos || pos == str)
\r
87 *prefix_out = talloc_strndup (ctx, str, pos - str);
\r
88 if (! *prefix_out) {
\r