nullprop/halflife-photomode
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix double decrement of buffer size variable in localization code

Browse source
This commit is contained in:
Sam V 2024-02-21 23:41:36 +01:00
parent a3aeea468f
commit d2da2f17fd
1 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
cl_dll/text_message.cpp
View file

@ -57,7 +57,7 @@ char* CHudTextMessage::LocaliseTextString(const char* msg, char* dst_buffer, int
// Subtract one so we have space for the null terminator no matter what.
std::size_t remainingBufferSize = buffer_size - 1;
for (const char* src = msg; *src != '\0' && remainingBufferSize > 0; --remainingBufferSize)
for (const char* src = msg; *src != '\0' && remainingBufferSize > 0;)
{
if (*src == '#')
{
@ -90,29 +90,26 @@ char* CHudTextMessage::LocaliseTextString(const char* msg, char* dst_buffer, int
// lookup msg name in titles.txt
client_textmessage_t* clmsg = TextMessageGet(word_buf);
if (!clmsg || !(clmsg->pMessage))
if (clmsg && clmsg->pMessage)
{
src = word_start;
*dst = *src;
dst++;
src++;
// copy string into message over the msg name
const std::size_t count = std::min(remainingBufferSize, std::strlen(clmsg->pMessage));
std::strncpy(dst, clmsg->pMessage, count);
dst += count;
remainingBufferSize -= count;
continue;
}
// copy string into message over the msg name
const std::size_t count = std::min(remainingBufferSize, std::strlen(clmsg->pMessage));
std::strncpy(dst, clmsg->pMessage, count);
dst += count;
remainingBufferSize -= count;
}
else
{
*dst = *src;
dst++;
src++;
src = word_start;
}
*dst = *src;
dst++;
src++;
--remainingBufferSize;
}
*dst = '\0'; // ensure null termination