Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check if s and locale_charset ptrs are NULL before conversion

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-01-27 00:07:50 +01:00
parent 22c48d0314
commit 5b5d33c642
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/charset.cpp
View File

@@ -166,14 +166,14 @@ std::string locale_to_utf_cpy(const std::string &s)
void str_pool_utf_to_locale(char *&s) void str_pool_utf_to_locale(char *&s)
{ {
if (!has_non_ascii_chars(s)) if (!s || !locale_charset || !has_non_ascii_chars(s))
return; return;
charset_convert("utf8", locale_charset, s); charset_convert("utf8", locale_charset, s);
} }
void str_pool_locale_to_utf(char *&s) void str_pool_locale_to_utf(char *&s)
{ {
if (!has_non_ascii_chars(s)) if (!s || !locale_charset || !has_non_ascii_chars(s))
return; return;
charset_convert(locale_charset, "utf8", s); charset_convert(locale_charset, "utf8", s);
} }