mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Code Issues Releases Wiki Activity

Add safe_strncpy function

Browse Source 
safe_strncpy is similar to strncpy, but makes sure buffer is
null-terminated. Update most of project to use this updated function to
prevent illegal memory accesses.
This commit is contained in:
Michał Janiszewski
2015-10-30 15:18:29 +01:00
parent 653c2b2701
commit 9284930d7e
41 changed files with 208 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/network.cpp
View File

@@ -43,6 +43,7 @@ extern "C" {
#include "../localisation/localisation.h"
#include "../scenario.h"
#include "../windows/error.h"
#include "../util/util.h"
}
#pragma comment(lib, "Ws2_32.lib")
@@ -147,7 +148,7 @@ void NetworkPacket::Clear()
NetworkPlayer::NetworkPlayer(const char* name)
{
strncpy((char*)NetworkPlayer::name, name, sizeof(NetworkPlayer::name));
safe_strncpy((char*)NetworkPlayer::name, name, sizeof(NetworkPlayer::name));
NetworkPlayer::name[sizeof(NetworkPlayer::name) - 1] = 0;
ping = 0;
flags = 0;
@@ -664,7 +665,7 @@ const char* Network::FormatChat(NetworkPlayer* fromplayer, const char* text)
if (fromplayer) {
lineCh = utf8_write_codepoint(lineCh, FORMAT_OUTLINE);
lineCh = utf8_write_codepoint(lineCh, FORMAT_BABYBLUE);
strcpy(lineCh, (const char*)fromplayer->name);
safe_strncpy(lineCh, (const char*)fromplayer->name, 1024);
strcat(lineCh, ": ");
}
strcat(formatted, text);