Main: check the g_get_user_special_dir() result

Fixes crash.

Main: check the g_get_user_special_dir() result
a88c23b6 · Max Kellermann · 216e37bf · a88c23b6
Commit a88c23b6 authored Oct 30, 2013 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

Main.cxx src/Main.cxx +7 -4

No files found.
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -135,10 +135,13 @@ glue_mapper_init(Error &error)
 		return false;

 	if (music_dir.IsNull()) {
-		music_dir = AllocatedPath::FromUTF8(g_get_user_special_dir(G_USER_DIRECTORY_MUSIC),
-						    error);
-		if (music_dir.IsNull())
-			return false;
+		const char *path =
+			g_get_user_special_dir(G_USER_DIRECTORY_MUSIC);
+		if (path != nullptr) {
+			music_dir = AllocatedPath::FromUTF8(path, error);
+			if (music_dir.IsNull())
+				return false;
+		}
 	}

 	mapper_init(std::move(music_dir), std::move(playlist_dir));