VanessaE
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory leak in guiConfirmRegistration

master
HybridDog 2018-06-27 18:09:45 +02:00 committed by SmallJoker
parent 738c8b102b
commit 53dd781927
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/guiConfirmRegistration.cpp
View File

@ -99,9 +99,10 @@ void GUIConfirmRegistration::regenerateGui(v2u32 screensize)
snprintf(info_text_buf, sizeof(info_text_buf), info_text_template.c_str(),
address.c_str(), m_playername.c_str());
gui::IGUIEditBox *e = new gui::intlGUIEditBox(
utf8_to_wide_c(info_text_buf), true, Environment, this,
ID_message, rect2, false, true);
wchar_t *info_text_buf_wide = utf8_to_wide_c(info_text_buf);
gui::IGUIEditBox *e = new gui::intlGUIEditBox(info_text_buf_wide, true,
Environment, this, ID_message, rect2, false, true);
delete[] info_text_buf_wide;
e->drop();
e->setMultiLine(true);
e->setWordWrap(true);

2
src/util/string.cpp
View File

@ -167,6 +167,8 @@ std::string wide_to_utf8(const std::wstring &input)
#endif // _WIN32
// You must free the returned string!
// The returned string is allocated using new
wchar_t *utf8_to_wide_c(const char *str)
{
std::wstring ret = utf8_to_wide(std::string(str));