Permalink
Browse files

Fix memory leak in guiConfirmRegistration

  • Loading branch information...
HybridDog authored and SmallJoker committed Jun 27, 2018
1 parent 738c8b1 commit 53dd7819277c53954d1298dfffa5287c306db8d0
Showing with 6 additions and 3 deletions.
  1. +4 −3 src/gui/guiConfirmRegistration.cpp
  2. +2 −0 src/util/string.cpp
@@ -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);
@@ -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));

0 comments on commit 53dd781

Please sign in to comment.