From e058e90117300125af7b6e93eb0e5aeb23543af9 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Sun, 12 Apr 2009 15:11:37 +0000 Subject: [PATCH 1/1] Fix memmove size Correct the byte count for several memmove calls. Signed-off-by: Geoff Levand Signed-off-by: Jeremy Kerr --- lib/waiter/waiter.c | 3 ++- ui/common/discover-client.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/waiter/waiter.c b/lib/waiter/waiter.c index 214dfda..68f483a 100644 --- a/lib/waiter/waiter.c +++ b/lib/waiter/waiter.c @@ -43,7 +43,8 @@ void waiter_remove(struct waiter *waiter) assert(i >= 0 && i < n_waiters); n_waiters--; - memmove(&waiters[i], &waiters[i+1], n_waiters - i); + memmove(&waiters[i], &waiters[i+1], + (n_waiters - i) * sizeof(waiters[0])); waiters = talloc_realloc(NULL, waiters, struct waiter, n_waiters); } diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c index b1ef440..e8ce4dd 100644 --- a/ui/common/discover-client.c +++ b/ui/common/discover-client.c @@ -111,7 +111,7 @@ static void device_remove(struct discover_client *client, const char *id) /* remove the device from the client's device array */ client->n_devices--; memmove(&client->devices[i], &client->devices[i+1], - client->n_devices - i); + (client->n_devices - i) * sizeof(client->devices[0])); client->devices = talloc_realloc(client, client->devices, struct device *, client->n_devices); -- 2.39.2