Construct a Null AllocatedPath if the filename conversion into UTF8 failed

7e7b4030 · Florent Le Coz · Max Kellermann · c64ad78c · 7e7b4030 · 7e7b4030
Commit 7e7b4030 authored Nov 11, 2014 by Florent Le Coz Committed by Max Kellermann Nov 11, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

NEWS NEWS +1 -0

AllocatedPath.cxx src/fs/AllocatedPath.cxx +5 -1

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.18.18 (not yet released)
 * decoder
  - ffmpeg: support opus
+* fix crash on failed filename charset conversion

 ver 0.18.17 (2014/11/02)
 * playlist

--- a/src/fs/AllocatedPath.cxx
+++ b/src/fs/AllocatedPath.cxx
@@ -46,7 +46,11 @@ AllocatedPath::Build(const_pointer a, const_pointer b)
 AllocatedPath
 AllocatedPath::FromUTF8(const char *path_utf8)
 {
-	return AllocatedPath(Donate(), ::PathFromUTF8(path_utf8));
+	char *path = ::PathFromUTF8(path_utf8);
+	if (path == nullptr)
+		return AllocatedPath::Null();
+
+	return AllocatedPath(Donate(), path);
 }

 AllocatedPath