Re: [PATCH] Don't allow fast-import tree delta chains to exceed maximum depth

From: Brian Downing <bdowning@lavos.net>
Date: Nov 14, 2007, 05:45 UTC
Message-ID: <20071114054524.GV6212@lavos.net>
In-Reply-To: <20071114044842.GA6876@spearce.org>

On Tue, Nov 13, 2007 at 11:48:42PM -0500, Shawn O. Pearce wrote:

Show 9 quoted lines

> @@ -1105,7 +1108,7 @@ static int store_object(
>  		unsigned pos = sizeof(hdr) - 1;
>  
>  		delta_count_by_type[type]++;
> -		last->depth++;
> +		e->depth = ++last->depth++;
>  
>  		hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr);
>  		write_or_die(pack_data->pack_fd, hdr, hdrlen);

I'm not sure, but I think that's too many ++'s.

The earlier patch had:

@@ -1084,6 +1087,7 @@ static int store_object(

                delta_count_by_type[type]++;
                last->depth++;
+               e->depth = last->depth;

                hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr);
                write_or_die(pack_data->pack_fd, hdr, hdrlen);

Which of course would be the equivalent of:

> +		e->depth = ++last->depth;

Maybe there's some cleverness here I'm missing, though.

-bcd