Mapper: _get_music_directory_utf8() may return nullptr

If no music_directory is configured, return nullptr instead of an empty string. This fixes a crash when db_file is configured without music_directory.

Mapper: _get_music_directory_utf8() may return nullptr
67b8124a · Max Kellermann · 51ec499c · 67b8124a · 67b8124a · 67b8124a
Commit 67b8124a authored Nov 22, 2013 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

NEWS NEWS +2 -0

Mapper.cxx src/Mapper.cxx +3 -1

Mapper.hxx src/Mapper.hxx +2 -1

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.18.5 (20??/??/??)
+* configuration
+  - fix crash when db_file is configured without music_directory
 * decoder
  - fluidsynth: auto-detect by default
 * fix ia64, mipsel and other little-endian architectures

--- a/src/Mapper.cxx
+++ b/src/Mapper.cxx
@@ -133,7 +133,9 @@ void mapper_finish(void)
 const char *
 mapper_get_music_directory_utf8(void)
 {
-	return music_dir_utf8.c_str();
+	return music_dir_utf8.empty()
+		? nullptr
+		: music_dir_utf8.c_str();
 }

 const AllocatedPath &

--- a/src/Mapper.hxx
+++ b/src/Mapper.hxx
@@ -41,7 +41,8 @@ mapper_init(AllocatedPath &&music_dir, AllocatedPath &&playlist_dir);
 void mapper_finish(void);

 /**
- * Return the absolute path of the music directory encoded in UTF-8.
+ * Return the absolute path of the music directory encoded in UTF-8 or
+ * nullptr if no music directory was configured.
 */
 gcc_const
 const char *