Merge branch 'ew/directory'

* ew/directory: (21 commits)
  update: fix multiple deletes from *vec iterators
  directory: children leave parents before being free()ed
  directory: always maintain sorted properties vectors
  update: simplify the serialized_delete usage a bit
  update: remove delete_each_song and clear_directory
  directory: directory_free kills all that it contains
  update: serialize directory deletions
  update: serialize song_free in main thread
  dirvec: introduce locking for all iterators
  dirvec: use dirvec_for_each where it makes sense
  dirvec: add dirvec_for_each iterator
  songvec: avoid holding nr_lock during free(3)
  update: allow music_root updates to be queued
  update: validate in command.c and fix small memory leak
  directory: rename isRootDirectory => path_is_music_root
  Avoid calling isRootDirectory when we have a directory object
  directory: make music_root global and avoid runtime initialization
  directory: use mpd_sizeof_str_flex_array for path, too
  tag_item: avoid wasting space when struct is unpackable
  song: use mpd_sizeof_str_flex_array for song.url
  ...

[ew: fixed up merge errors with myself when isRootDirectory
 went away]

1 files changed, 3 insertions, 1 deletions

diff --git a/src/tag_pool.c b/src/tag_pool.c
index d227a2988..1d92502cc 100644
--- a/src/tag_pool.c
+++ b/src/tag_pool.c
@@ -67,7 +67,9 @@ static struct slot *slot_alloc(struct slot *next,
 			       enum tag_type type,
 			       const char *value, int length)
 {
-	struct slot *slot = xmalloc(sizeof(*slot) + length);
+	struct slot *slot;
+
+	slot = xmalloc(sizeof(*slot) - sizeof(slot->item.value) + length + 1);
 	slot->next = next;
 	slot->ref = 1;
 	slot->item.type = type;