Re: [PATCH 1/3] untracked-cache: be defensive about missing NULs in index

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 19, 2019, 05:29 UTC
Message-ID: <xmqqa7gmef55.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20190418211701.GA18520@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 8 quoted lines

> -	len = strlen((const char *)data);
> -	next = data + len + 1;
> -	if (next > rd->end)
> +	eos = memchr(data, '\0', end - data);
> +	if (!eos || eos == end)
>  		return -1;
> +	len = eos - data;
> +	next = eos + 1;

Yup, much nicer.

Show 10 quoted lines

> -		len = strlen((const char *)data);
> -		next = data + len + 1;
> -		if (next > rd->end)
> +		eos = memchr(data, '\0', end - data);
> +		if (!eos || eos == end)
>  			return -1;
> -		untracked->untracked[i] = xstrdup((const char*)data);
> +		len = eos - data;
> +		next = eos + 1;
> +		untracked->untracked[i] = xmemdupz(data, len);

Same here, too.

Thanks.