[PATCH 2/2] check_expirations: don't copy over same element
- From
Thomas Rast <trast@student.ethz.ch>
- Date
- Sep 16, 2011, 11:51 UTC
- Message-ID
- <29010bf6134beb20efca498e7b4f7a9d9bdb21a6.1316173346.git.trast@student.ethz.ch>
- In-Reply-To
- <a6397f7f28a5adcd34aeac98cca6500e336698aa.1316173346.git.trast@student.ethz.ch>
The credentials expiry loop looks at a credential, and if it's expired, frees it and memcpy()s the last credential in the now free place.
This results in a memcpy() with source=destination, which technically yields undefined behaviour. Instead of turning it into a memmove, don't copy anything if we deleted the last entry.
Signed-off-by: Thomas Rast <trast@student.ethz.ch> ---
Valgrind complained. Sorry for not running it earlier when we were discussing the poll issue...
credential-cache--daemon.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
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)); /* * Stick around 30 seconds in case a new credential * shows up (e.g., because we just removed a failed
-- 1.7.7.rc1.366.ge210a6