Re: [PATCH 2/2] check_expirations: don't copy over same element

From: Jeff King <peff@peff.net>
Date: Sep 16, 2011, 15:47 UTC
Message-ID: <20110916154718.GA13740@sigill.intra.peff.net>
In-Reply-To: <29010bf6134beb20efca498e7b4f7a9d9bdb21a6.1316173346.git.trast@student.ethz.ch>

On Fri, Sep 16, 2011 at 01:51:35PM +0200, Thomas Rast wrote:

Show 11 quoted lines

> diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c
> index d6769b1..128c5ce 100644
> --- a/credential-cache--daemon.c
> +++ b/credential-cache--daemon.c
> @@ -77,7 +77,8 @@ static int check_expirations(void)
>  			free(entries[i].item.unique);
>  			free(entries[i].item.username);
>  			free(entries[i].item.password);
> -			memcpy(&entries[i], &entries[entries_nr], sizeof(*entries));
> +			if (i != entries_nr)
> +				memcpy(&entries[i], &entries[entries_nr], sizeof(*entries));

Thanks. I even remember while writing this loop considering the case of (i == entries_nr), but decided it didn't need special-casing. But I obviously forgot about memcpy.

Both this and the prior patch are:

Acked-by: Jeff King <peff@peff.net>

-Peff