metin-server/m2dev-server-src
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

std::strncpy back to strlcpy

Browse Source
This commit is contained in:
d1str4ught
2025-08-22 17:45:31 +02:00
parent 5c9ae80bcd
commit 920a3fc861
59 changed files with 309 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/game/char.cpp
View File

@@ -616,7 +616,7 @@ void CHARACTER::OpenMyShop(const char * c_pszSign, TShopItemTable * pTable, BYTE
}
char szSign[SHOP_SIGN_MAX_LEN+1];
std::strncpy(szSign, c_pszSign, sizeof(szSign));
strlcpy(szSign, c_pszSign, sizeof(szSign));
m_stShopSign = szSign;
@@ -736,7 +736,7 @@ void CHARACTER::OpenMyShop(const char * c_pszSign, TShopItemTable * pTable, BYTE
p.bHeader = HEADER_GC_SHOP_SIGN;
p.dwVID = GetVID();
std::strncpy(p.szSign, c_pszSign, sizeof(p.szSign));
strlcpy(p.szSign, c_pszSign, sizeof(p.szSign));
PacketAround(&p, sizeof(TPacketGCShopSign));
@@ -932,7 +932,7 @@ void CHARACTER::EncodeInsertPacket(LPENTITY entity)
else
{
show_all_info:
std::strncpy(addPacket.name, GetName(), sizeof(addPacket.name));
strlcpy(addPacket.name, GetName(), sizeof(addPacket.name));
if (GetGuild() != NULL)
{
@@ -982,7 +982,7 @@ void CHARACTER::EncodeInsertPacket(LPENTITY entity)
p.bHeader = HEADER_GC_SHOP_SIGN;
p.dwVID = GetVID();
std::strncpy(p.szSign, m_stShopSign.c_str(), sizeof(p.szSign));
strlcpy(p.szSign, m_stShopSign.c_str(), sizeof(p.szSign));
d->Packet(&p, sizeof(TPacketGCShopSign));
}
@@ -1165,14 +1165,14 @@ void CHARACTER::CreatePlayerProto(TPlayerTable & tab)
if (GetNewName().empty())
{
std::strncpy(tab.name, GetName(), sizeof(tab.name));
strlcpy(tab.name, GetName(), sizeof(tab.name));
}
else
{
std::strncpy(tab.name, GetNewName().c_str(), sizeof(tab.name));
strlcpy(tab.name, GetNewName().c_str(), sizeof(tab.name));
}
std::strncpy(tab.ip, GetDesc()->GetHostName(), sizeof(tab.ip));
strlcpy(tab.ip, GetDesc()->GetHostName(), sizeof(tab.ip));
tab.id = m_dwPlayerID;
tab.voice = GetPoint(POINT_VOICE);
@@ -1262,7 +1262,7 @@ void CHARACTER::CreatePlayerProto(TPlayerTable & tab)
tab.quickslot[i] = m_quickslot[i];
if (m_stMobile.length() && !*m_szMobileAuth)
std::strncpy(tab.szMobile, m_stMobile.c_str(), sizeof(tab.szMobile));
strlcpy(tab.szMobile, m_stMobile.c_str(), sizeof(tab.szMobile));
thecore_memcpy(tab.parts, m_pointsInstant.parts, sizeof(tab.parts));
@@ -1341,7 +1341,7 @@ void CHARACTER::Disconnect(const char * c_pszReason)
// P2P Logout
TPacketGGLogout p;
p.bHeader = HEADER_GG_LOGOUT;
std::strncpy(p.szName, GetName(), sizeof(p.szName));
strlcpy(p.szName, GetName(), sizeof(p.szName));
P2P_MANAGER::instance().Send(&p, sizeof(TPacketGGLogout));
char buf[51];
snprintf(buf, sizeof(buf), "%s %d %d %ld %d",
@@ -1573,10 +1573,10 @@ void CHARACTER::MainCharacterPacket()
mainChrPacket.lz = GetZ();
mainChrPacket.empire = GetDesc()->GetEmpire();
mainChrPacket.skill_group = GetSkillGroup();
std::strncpy(mainChrPacket.szChrName, GetName(), sizeof(mainChrPacket.szChrName));
strlcpy(mainChrPacket.szChrName, GetName(), sizeof(mainChrPacket.szChrName));
mainChrPacket.fBGMVol = bgmInfo.vol;
std::strncpy(mainChrPacket.szBGMName, bgmInfo.name.c_str(), sizeof(mainChrPacket.szBGMName));
strlcpy(mainChrPacket.szBGMName, bgmInfo.name.c_str(), sizeof(mainChrPacket.szBGMName));
GetDesc()->Packet(&mainChrPacket, sizeof(TPacketGCMainCharacter4_BGM_VOL));
}
else
@@ -1591,8 +1591,8 @@ void CHARACTER::MainCharacterPacket()
mainChrPacket.lz = GetZ();
mainChrPacket.empire = GetDesc()->GetEmpire();
mainChrPacket.skill_group = GetSkillGroup();
std::strncpy(mainChrPacket.szChrName, GetName(), sizeof(mainChrPacket.szChrName));
std::strncpy(mainChrPacket.szBGMName, bgmInfo.name.c_str(), sizeof(mainChrPacket.szBGMName));
strlcpy(mainChrPacket.szChrName, GetName(), sizeof(mainChrPacket.szChrName));
strlcpy(mainChrPacket.szBGMName, bgmInfo.name.c_str(), sizeof(mainChrPacket.szBGMName));
GetDesc()->Packet(&mainChrPacket, sizeof(TPacketGCMainCharacter3_BGM));
}
//if (m_stMobile.length())
@@ -1612,7 +1612,7 @@ void CHARACTER::MainCharacterPacket()
pack.lz = GetZ();
pack.empire = GetDesc()->GetEmpire();
pack.skill_group = GetSkillGroup();
std::strncpy(pack.szName, GetName(), sizeof(pack.szName));
strlcpy(pack.szName, GetName(), sizeof(pack.szName));
GetDesc()->Packet(&pack, sizeof(TPacketGCMainCharacter));
if (m_stMobile.length())
@@ -5355,7 +5355,7 @@ void CHARACTER::WarpEnd()
TPacketGGLogin p;
p.bHeader = HEADER_GG_LOGIN;
std::strncpy(p.szName, GetName(), sizeof(p.szName));
strlcpy(p.szName, GetName(), sizeof(p.szName));
p.dwPID = GetPlayerID();
p.bEmpire = GetEmpire();
p.lMapIndex = SECTREE_MANAGER::instance().GetMapIndex(GetX(), GetY());
@@ -5601,8 +5601,8 @@ void CHARACTER::ReqSafeboxLoad(const char* pszPassword)
TSafeboxLoadPacket p;
p.dwID = GetDesc()->GetAccountTable().id;
std::strncpy(p.szLogin, GetDesc()->GetAccountTable().login, sizeof(p.szLogin));
std::strncpy(p.szPassword, pszPassword, sizeof(p.szPassword));
strlcpy(p.szLogin, GetDesc()->GetAccountTable().login, sizeof(p.szLogin));
strlcpy(p.szPassword, pszPassword, sizeof(p.szPassword));
db_clientdesc->DBPacket(HEADER_GD_SAFEBOX_LOAD, GetDesc()->GetHandle(), &p, sizeof(p));
}
@@ -6553,7 +6553,7 @@ void CHARACTER::ConfirmWithMsg(const char* szMsg, int iTimeout, DWORD dwRequestP
p.header = HEADER_GC_QUEST_CONFIRM;
p.requestPID = dwRequestPID;
p.timeout = iTimeout;
std::strncpy(p.msg, szMsg, sizeof(p.msg));
strlcpy(p.msg, szMsg, sizeof(p.msg));
GetDesc()->Packet(&p, sizeof(p));
}