Skip to content

Fix multibyte truncation when pasting strings in chat #1050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anf3is wants to merge 1 commit into
base: reactivedrop_beta
Choose a base branch
from
Open

Fix multibyte truncation when pasting strings in chat #1050

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/game/client/hud_basechat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2553,12 +2553,15 @@ void CBaseHudChatEntry::InsertChar(wchar_t ch)
return;
}

/* Pasting strings that overflow and end with multibyte+singlebyte will truncate unintuitively ("...ABC?!!" -> "...AB?")
// Edge case: check if current wchar_t will cause Send to truncate message
int iCharByteLen; // utf-8
if ( ch < 0x80 ) iCharByteLen = 1;
else if ( ch < 0x800 ) iCharByteLen = 2;
else if ( ch >= 0xD800 && ch <= 0xDBFF ) iCharByteLen = 4; // high surrogate, assume pair
else if ( ch >= 0xDC00 && ch <= 0xDFFF ) // low surrogate
*/
if ( ch >= 0xDC00 && ch <= 0xDFFF ) // low surrogate
{
// Check if previous wchar was a high surrogate
wchar_t wszHigh[2];
Expand All @@ -2567,13 +2570,15 @@ void CBaseHudChatEntry::InsertChar(wchar_t ch)
if ( wszHigh[0] >= 0xD800 && wszHigh[0] <= 0xDBFF ) { BaseClass::InsertChar(ch); return; }
else return; // it was not a hight surrogate, reject
}
/*
else iCharByteLen = 3;

if ( iCurrentByteLen + iCharByteLen <= m_iMaxByteCount )
{
BaseClass::InsertChar(ch);
return;
}
*/

return; // do not insert anything
}
Loading