BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix wctomb use

Browse Source 
wctomb(NULL, _) returns "nonzero if the encoding has nontrivial shift state, or zero if the encoding is stateless."

I assume the intentation was to get the size of the target buffer.
Use MB_CUR_MAX for this.
This commit is contained in:
Andreas Zwinkau 2012-07-03 23:13:15 +02:00 committed by Perttu Ahola
parent e79ad21aeb
commit 28e7443f9b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/keycode.cpp
View File

@ -293,8 +293,7 @@ KeyPress::KeyPress(const irr::SEvent::SKeyInput &in)
if (valid_kcode(Key)) { if (valid_kcode(Key)) {
m_name = KeyNames[Key]; m_name = KeyNames[Key];
} else { } else {
size_t maxlen = wctomb(NULL, Char); m_name.resize(MB_CUR_MAX+1, '\0');
m_name.resize(maxlen+1, '\0');
int written = wctomb(&m_name[0], Char); int written = wctomb(&m_name[0], Char);
assert (written >= 0 && "unexpected multibyte character"); assert (written >= 0 && "unexpected multibyte character");
} }