update: fix multiple deletes from *vec iterators

{song,dir}vec_for_each each failed to gracefully handle deleted
files when iterating through.  While we were thread-safe, we
were not safe within the calling thread.  If a callback we
passed caused sv->nr to shring, our index would still increment;
causing files to stay in the database.

A way to test this is to remove 10 or so contiguous songs from a
>10 song directory.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/dirvec.c b/src/dirvec.c
index 91b371b8a..a5eb6d54e 100644
--- a/src/dirvec.c
+++ b/src/dirvec.c
@@ -88,16 +88,20 @@ int dirvec_for_each(const struct dirvec *dv,
                     int (*fn)(struct directory *, void *), void *arg)
 {
 	size_t i;
+	size_t prev_nr;
 
 	pthread_mutex_lock(&nr_lock);
-	for (i = 0; i < dv->nr; ++i) {
+	for (i = 0; i < dv->nr; ) {
 		struct directory *dir = dv->base[i];
 
 		assert(dir);
+		prev_nr = dv->nr;
 		pthread_mutex_unlock(&nr_lock);
 		if (fn(dir, arg) < 0)
 			return -1;
 		pthread_mutex_lock(&nr_lock); /* dv->nr may change in fn() */
+		if (prev_nr == dv->nr)
+			++i;
 	}
 	pthread_mutex_unlock(&nr_lock);