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

charset: use free() instead of delete[] to release memory allocated by strdup()

Browse Source
This commit is contained in:
Damien Leone
2010-03-03 21:25:24 +01:00
committed by Andrzej Rybczak
parent 6df8ae1694
commit 331107387c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/charset.cpp
View File

@@ -88,7 +88,7 @@ namespace
iconv_close(cd); iconv_close(cd);
*outbuf = 0; *outbuf = 0;
if (delete_old) if (delete_old)
delete [] instart; free(const_cast<char *>(instart));
inbuf = outstart; inbuf = outstart;
} }
} }
@@ -100,7 +100,7 @@ void utf_to_locale(std::string &s)
const char *tmp = strdup(s.c_str()); const char *tmp = strdup(s.c_str());
charset_convert("utf-8", Config.system_encoding.c_str(), tmp, 1, s.length()); charset_convert("utf-8", Config.system_encoding.c_str(), tmp, 1, s.length());
s = tmp; s = tmp;
delete [] tmp; free(const_cast<char *>(tmp));
} }
std::string utf_to_locale_cpy(const std::string &s) std::string utf_to_locale_cpy(const std::string &s)
@@ -117,7 +117,7 @@ void locale_to_utf(std::string &s)
const char *tmp = strdup(s.c_str()); const char *tmp = strdup(s.c_str());
charset_convert(Config.system_encoding.c_str(), "utf-8", tmp, 1, s.length()); charset_convert(Config.system_encoding.c_str(), "utf-8", tmp, 1, s.length());
s = tmp; s = tmp;
delete [] tmp; free(const_cast<char *>(tmp));
} }
std::string locale_to_utf_cpy(const std::string &s) std::string locale_to_utf_cpy(const std::string &s)