oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/Charset: don't allow nullptr arguments

Browse Source
This commit is contained in:
Max Kellermann
2013-10-17 22:39:06 +02:00
parent 080ee87e07
commit f951e5356b
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/fs/Charset.cxx
View File

@@ -79,8 +79,7 @@ GetFSCharset()
std::string
PathToUTF8(const char *path_fs)
{
if (path_fs == nullptr)
return std::string();
assert(path_fs != nullptr);
GIConv conv = g_iconv_open("utf-8", fs_charset.c_str());
if (conv == reinterpret_cast<GIConv>(-1))
@@ -107,6 +106,8 @@ PathToUTF8(const char *path_fs)
char *
PathFromUTF8(const char *path_utf8)
{
assert(path_utf8 != nullptr);
return g_convert(path_utf8, -1,
fs_charset.c_str(), "utf-8",
nullptr, nullptr, nullptr);