From 06c8a9ed0b1a01343d21859bff22ae67f4b29021 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 14 Oct 2008 11:10:00 +0200 Subject: {dir,song}vec: fix off-by-one errors in {dir,song}vec_delete Found by Valgrind while looking for another bug... Hmm.. I should really just make this code generic since they're duplicated... --- src/dirvec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/dirvec.c') diff --git a/src/dirvec.c b/src/dirvec.c index 72b1c0084..98cb9e7ad 100644 --- a/src/dirvec.c +++ b/src/dirvec.c @@ -37,9 +37,9 @@ struct directory *dirvec_find(const struct dirvec *dv, const char *path) int dirvec_delete(struct dirvec *dv, struct directory *del) { - int i; + size_t i; - for (i = dv->nr; --i >= 0; ) { + for (i = 0; i < dv->nr; ++i) { if (dv->base[i] != del) continue; /* we _don't_ call directory_free() here */ @@ -48,7 +48,7 @@ int dirvec_delete(struct dirvec *dv, struct directory *del) dv->base = NULL; } else { memmove(&dv->base[i], &dv->base[i + 1], - (dv->nr - i + 1) * sizeof(struct directory *)); + (dv->nr - i) * sizeof(struct directory *)); dv->base = xrealloc(dv->base, dv_size(dv)); } return i; -- cgit v1.2.3