From 5d06236acb3f4b4420d825c8931b5b7447d845c4 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 9 May 2011 21:48:31 +0200 Subject: directory_save: fix assertion failure on space-only directory name --- NEWS | 1 + src/directory_save.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/NEWS b/NEWS index a6deae06a..afdd66c49 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ ver 0.15.17 (2011/??/??) - vorbis: reset the Ogg stream after flush * decoders: - vorbis: fix tremor support +* database: fix assertion failure on space-only directory name ver 0.15.16 (2011/03/13) diff --git a/src/directory_save.c b/src/directory_save.c index 132508447..d768a36c8 100644 --- a/src/directory_save.c +++ b/src/directory_save.c @@ -126,6 +126,14 @@ directory_load(FILE *fp, struct directory *directory, GError **error) return false; } + if (*name == 0) + /* workaround: a base name that + consists only of spaces is cleared + by g_strchomp(), and that may cause + an assertion failure in + directory_new() */ + continue; + subdir = directory_get_child(directory, name); if (subdir != NULL) { assert(subdir->parent == directory); -- cgit v1.2.3