R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve server print messages

Browse Source 
Always format with a newline if one is missing.
Calculate string size directly from 'ReadString' in 'SVC_UserMessage::ProcessImpl'.
Added additional asserts to detect code errors.
This commit is contained in:
Kawe Mazidjatari 2023-04-09 22:22:06 +02:00
parent a39afd4efe
commit bd8b9e8c77
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
r5dev/common/netmessages.cpp
View File

@ -16,7 +16,15 @@ bool SVC_Print::ProcessImpl()
{
if (this->m_szText)
{
DevMsg(eDLL_T::SERVER, "%s", this->m_szText);
Assert(m_szText == m_szTextBuffer); // Should always point to 'm_szTextBuffer'.
size_t len = strnlen_s(m_szText, sizeof(m_szTextBuffer));
Assert(len < sizeof(m_szTextBuffer));
if (len < sizeof(m_szTextBuffer))
{
DevMsg(eDLL_T::SERVER, m_szText[len-1] == '\n' ? "%s" : "%s\n", m_szText);
}
}
return true; // Original just return true also.
@ -31,10 +39,14 @@ bool SVC_UserMessage::ProcessImpl()
type == HUD_PRINTCENTER)
{
char text[MAX_USER_MSG_DATA];
buf.ReadString(text, sizeof(text));
if (strnlen_s(text, sizeof(text)) >= NET_MIN_MESSAGE)
int len;
buf.ReadString(text, sizeof(text), false, &len);
Assert(len < sizeof(text));
if (len >= NET_MIN_MESSAGE && len < sizeof(text))
{
DevMsg(eDLL_T::SERVER, "%s", text);
DevMsg(eDLL_T::SERVER, text[len-1] == '\n' ? "%s" : "%s\n", text);
}
}