diff options
| author | Max Kellermann <max@duempel.org> | 2014-11-18 21:47:20 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-11-18 21:47:20 +0100 |
| commit | 26382713c26139e474bda5e74798e1201e036b82 (patch) | |
| tree | da03a95d2cf840843e1e02052d2d87d8e513ee0f /src/fs/AllocatedPath.cxx | |
| parent | f37481f843c3ae7aa0c43591c9c7fc4a501c1f5b (diff) | |
| parent | d6bc5c35a730a9542af79118369022115009eddd (diff) | |
| download | mpd-26382713c26139e474bda5e74798e1201e036b82.tar.gz mpd-26382713c26139e474bda5e74798e1201e036b82.tar.xz mpd-26382713c26139e474bda5e74798e1201e036b82.zip | |
Merge tag 'v0.19.4'
Diffstat (limited to '')
| -rw-r--r-- | src/fs/AllocatedPath.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/fs/AllocatedPath.cxx b/src/fs/AllocatedPath.cxx index 30ce7e3a9..ceaad73ea 100644 --- a/src/fs/AllocatedPath.cxx +++ b/src/fs/AllocatedPath.cxx @@ -46,7 +46,11 @@ AllocatedPath AllocatedPath::FromUTF8(const char *path_utf8) { #ifdef HAVE_GLIB - return AllocatedPath(Donate(), ::PathFromUTF8(path_utf8)); + char *path = ::PathFromUTF8(path_utf8); + if (path == nullptr) + return AllocatedPath::Null(); + + return AllocatedPath(Donate(), path); #else return FromFS(path_utf8); #endif |