From: Jani Nikula <jani@nikula.org>
To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org
Subject: Re: [PATCH] string-util: Disallow empty prefixes in
 parse_boolean_term
In-Reply-To: <1357593640-32122-1-git-send-email-amdragon@mit.edu>
References: <1357593640-32122-1-git-send-email-amdragon@mit.edu>
User-Agent: Notmuch/0.14+211~gc8d6546 (http://notmuchmail.org) Emacs/24.2.1
	(x86_64-pc-linux-gnu)
Date: Tue, 08 Jan 2013 00:12:43 +0200
Message-ID: <87ip78ej6s.fsf@nikula.org>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: list

On Mon, 07 Jan 2013, Austin Clements <amdragon@MIT.EDU> wrote:
> Xapian doesn't consider ":abc" to be a prefixed term.  This makes
> parse_boolean_term similarly reject queries with an empty prefix.

LGTM,
Jani.

> ---
>  util/string-util.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/util/string-util.c b/util/string-util.c
> index aba9aa8..a5622d7 100644
> --- a/util/string-util.c
> +++ b/util/string-util.c
> @@ -127,7 +127,7 @@ parse_boolean_term (void *ctx, const char *str,
>      /* Parse prefix */
>      str = skip_space (str);
>      const char *pos = strchr (str, ':');
> -    if (! pos)
> +    if (! pos || pos == str)
>  	goto FAIL;
>      *prefix_out = talloc_strndup (ctx, str, pos - str);
>      if (! *prefix_out) {
> -- 
> 1.7.10.4