diff options
| author | Max Kellermann <max@duempel.org> | 2014-11-02 14:06:05 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-11-02 14:06:05 +0100 |
| commit | 303d67aed2da79d4ddaa3a52093ed42ae9da064d (patch) | |
| tree | 060580f4c17b5d30d1e78e584df03c795ce4e1d7 /src/playlist/PlaylistRegistry.cxx | |
| parent | 575fbad254a1ce67530bf2aedc9852c89c072c3f (diff) | |
| parent | 6a7f6cdacd81877276563c42fdeacad3a8deface (diff) | |
| download | mpd-303d67aed2da79d4ddaa3a52093ed42ae9da064d.tar.gz mpd-303d67aed2da79d4ddaa3a52093ed42ae9da064d.tar.xz mpd-303d67aed2da79d4ddaa3a52093ed42ae9da064d.zip | |
Merge tag 'v0.19.2'
Diffstat (limited to 'src/playlist/PlaylistRegistry.cxx')
| -rw-r--r-- | src/playlist/PlaylistRegistry.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/playlist/PlaylistRegistry.cxx b/src/playlist/PlaylistRegistry.cxx index bc5932de3..4e9ef890e 100644 --- a/src/playlist/PlaylistRegistry.cxx +++ b/src/playlist/PlaylistRegistry.cxx @@ -139,12 +139,12 @@ static SongEnumerator * playlist_list_open_uri_suffix(const char *uri, Mutex &mutex, Cond &cond, const bool *tried) { - const char *suffix; SongEnumerator *playlist = nullptr; assert(uri != nullptr); - suffix = uri_get_suffix(uri); + UriSuffixBuffer suffix_buffer; + const char *const suffix = uri_get_suffix(uri, suffix_buffer); if (suffix == nullptr) return nullptr; @@ -257,7 +257,10 @@ playlist_list_open_stream(InputStream &is, const char *uri) return playlist; } - const char *suffix = uri != nullptr ? uri_get_suffix(uri) : nullptr; + UriSuffixBuffer suffix_buffer; + const char *suffix = uri != nullptr + ? uri_get_suffix(uri, suffix_buffer) + : nullptr; if (suffix != nullptr) { auto playlist = playlist_list_open_stream_suffix(is, suffix); if (playlist != nullptr) |