Migrate extensions to common AMTL string funcs (#785)

Headline · KyleSanderson · commit 5611ec54a21c · 2018-03-25T13:00:53.000-07:00
diff --git a/core/PlayerManager.cpp b/core/PlayerManager.cpp
@@ -2050,18 +2050,18 @@ void CPlayer::UpdateAuthIds()
 	}
 	
 	char szAuthBuffer[64];
-	snprintf(szAuthBuffer, sizeof(szAuthBuffer), "STEAM_%u:%u:%u", steam2universe, m_SteamId.GetAccountID() & 1, m_SteamId.GetAccountID() >> 1);
+	ke::SafeSprintf(szAuthBuffer, sizeof(szAuthBuffer), "STEAM_%u:%u:%u", steam2universe, m_SteamId.GetAccountID() & 1, m_SteamId.GetAccountID() >> 1);
 	
 	m_Steam2Id = szAuthBuffer;
 	
 	// TODO: make sure all hl2sdks' steamclientpublic.h have k_unSteamUserDesktopInstance.
 	if (m_SteamId.GetUnAccountInstance() == 1 /* k_unSteamUserDesktopInstance */)
 	{
-		snprintf(szAuthBuffer, sizeof(szAuthBuffer), "[U:%u:%u]", m_SteamId.GetEUniverse(), m_SteamId.GetAccountID());
+		ke::SafeSprintf(szAuthBuffer, sizeof(szAuthBuffer), "[U:%u:%u]", m_SteamId.GetEUniverse(), m_SteamId.GetAccountID());
 	}
 	else
 	{
-		snprintf(szAuthBuffer, sizeof(szAuthBuffer), "[U:%u:%u:%u]", m_SteamId.GetEUniverse(), m_SteamId.GetAccountID(), m_SteamId.GetUnAccountInstance());
+		ke::SafeSprintf(szAuthBuffer, sizeof(szAuthBuffer), "[U:%u:%u:%u]", m_SteamId.GetEUniverse(), m_SteamId.GetAccountID(), m_SteamId.GetUnAccountInstance());
 	}
 	
 	m_Steam3Id = szAuthBuffer;
diff --git a/core/logic/AdminCache.cpp b/core/logic/AdminCache.cpp
@@ -1090,14 +1090,14 @@ bool AdminCache::GetUnifiedSteamIdentity(const char *ident, char *out, size_t ma
 	else if (len >= 11 && !strncmp(ident, "STEAM_", 6) && ident[8] != '_')
 	{
 		// non-bot/lan Steam2 Id, strip off the STEAM_* part
-		snprintf(out, maxlen, "%s", &ident[8]);
+		ke::SafeStrcpy(out, maxlen, &ident[8]);
 		return true;
 	}
 	else if (len >= 7 && !strncmp(ident, "[U:", 3) && ident[len-1] == ']')
 	{
 		// Steam3 Id, replicate the Steam2 Post-"STEAM_" part
 		uint32_t accountId = strtoul(&ident[5], nullptr, 10);
-		snprintf(out, maxlen, "%u:%u", accountId & 1, accountId >> 1);
+		ke::SafeSprintf(out, maxlen, "%u:%u", accountId & 1, accountId >> 1);
 		return true;
 	}
 	else
@@ -1124,7 +1124,7 @@ bool AdminCache::GetUnifiedSteamIdentity(const char *ident, char *out, size_t ma
 				&& accountType == k_EAccountTypeIndividual && accountInstance <= k_unSteamUserWebInstance
 				)
 			{
-				snprintf(out, maxlen, "%u:%u", accountId & 1, accountId >> 1);
+				ke::SafeSprintf(out, maxlen, "%u:%u", accountId & 1, accountId >> 1);
 				return true;
 			}
 		}
diff --git a/core/logic/ExtensionSys.cpp b/core/logic/ExtensionSys.cpp
@@ -176,7 +176,7 @@ bool CLocalExtension::Load(char *error, size_t maxlength)
 	{
 		m_pLib->CloseLibrary();
 		m_pLib = NULL;
-		snprintf(error, maxlength, "Unable to find extension entry point");
+		ke::SafeStrcpy(error, maxlength, "Unable to find extension entry point");
 		return false;
 	}
 
@@ -246,7 +246,7 @@ void CLocalExtension::Unload()
 
 bool CRemoteExtension::Reload(char *error, size_t maxlength)
 {
-	snprintf(error, maxlength, "Remote extensions do not support reloading");
+	ke::SafeStrcpy(error, maxlength, "Remote extensions do not support reloading");
 	return false;
 }
 
@@ -280,13 +280,13 @@ bool CExtension::PerformAPICheck(char *error, size_t maxlength)
 {
 	if (!m_pAPI)
 	{
-		snprintf(error, maxlength, "No IExtensionInterface instance provided");
+		ke::SafeStrcpy(error, maxlength, "No IExtensionInterface instance provided");
 		return false;
 	}
 	
 	if (m_pAPI->GetExtensionVersion() > SMINTERFACE_EXTENSIONAPI_VERSION)
 	{
-		snprintf(error, maxlength, "Extension version is too new to load (%d, max is %d)", m_pAPI->GetExtensionVersion(), SMINTERFACE_EXTENSIONAPI_VERSION);
+		ke::SafeSprintf(error, maxlength, "Extension version is too new to load (%d, max is %d)", m_pAPI->GetExtensionVersion(), SMINTERFACE_EXTENSIONAPI_VERSION);
 		return false;
 	}
 
@@ -493,7 +493,7 @@ bool CExtension::IsRunning(char *error, size_t maxlength)
 	{
 		if (error)
 		{
-			snprintf(error, maxlength, "%s", m_Error.c_str());
+			ke::SafeStrcpy(error, maxlength, m_Error.c_str());
 		}
 		return false;
 	}
@@ -1136,7 +1136,7 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const ICommand
 				if (pExt->unload_code == (unsigned)atoi(unload))
 				{
 					char filename[PLATFORM_MAX_PATH];
-					snprintf(filename, PLATFORM_MAX_PATH, "%s", pExt->GetFilename());
+					ke::SafeStrcpy(filename, PLATFORM_MAX_PATH, pExt->GetFilename());
 					UnloadExtension(pExt);
 					rootmenu->ConsolePrint("[SM] Extension %s is now unloaded.", filename);
 				}
@@ -1151,7 +1151,7 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const ICommand
 				|| (!pExt->m_ChildDeps.size() && !pExt->m_Dependents.size()))
 			{
 				char filename[PLATFORM_MAX_PATH];
-				snprintf(filename, PLATFORM_MAX_PATH, "%s", pExt->GetFilename());
+				ke::SafeStrcpy(filename, PLATFORM_MAX_PATH, pExt->GetFilename());
 				UnloadExtension(pExt);
 				rootmenu->ConsolePrint("[SM] Extension %s is now unloaded.", filename);
 				return;
@@ -1252,7 +1252,7 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const ICommand
 				char filename[PLATFORM_MAX_PATH];
 				char error[255];
 				
-				snprintf(filename, PLATFORM_MAX_PATH, "%s", pExt->GetFilename());
+				ke::SafeStrcpy(filename, PLATFORM_MAX_PATH, pExt->GetFilename());
 				
 				if (pExt->Reload(error, sizeof(error)))
 				{
diff --git a/core/logic/LibrarySys.cpp b/core/logic/LibrarySys.cpp
@@ -66,7 +66,7 @@ CDirectory::CDirectory(const char *path)
 {
 #if defined PLATFORM_WINDOWS
 	char newpath[PLATFORM_MAX_PATH];
-	snprintf(newpath, sizeof(newpath), "%s\\*.*", path);
+	ke::SafeSprintf(newpath, sizeof(newpath), "%s\\*.*", path);
 	m_dir = FindFirstFileA(newpath, &m_fd);
 	if (!IsValid())
 	{
@@ -78,7 +78,7 @@ CDirectory::CDirectory(const char *path)
 	{
 		/* :TODO: we need to read past "." and ".."! */
 		ep = readdir(m_dir);
-		snprintf(m_origpath, PLATFORM_MAX_PATH, "%s", path);
+		ke::SafeStrcpy(m_origpath, PLATFORM_MAX_PATH, path);
 	} else {
 		ep = NULL;
 	}
@@ -125,7 +125,7 @@ bool CDirectory::IsEntryDirectory()
 	return ((m_fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY);
 #elif defined PLATFORM_POSIX
 	char temppath[PLATFORM_MAX_PATH];
-	int ret = snprintf(temppath, sizeof(temppath), "%s/%s", m_origpath, GetEntryName());
+	int ret = ke::SafeSprintf(temppath, sizeof(temppath), "%s/%s", m_origpath, GetEntryName());
 	if (static_cast<size_t>(ret) >= sizeof(temppath))
 		return false;
 	return ke::file::IsDirectory(temppath);
@@ -138,7 +138,7 @@ bool CDirectory::IsEntryFile()
 	return !(m_fd.dwFileAttributes & (FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_DEVICE));
 #elif defined PLATFORM_POSIX
 	char temppath[PLATFORM_MAX_PATH];
-	int ret = snprintf(temppath, sizeof(temppath), "%s/%s", m_origpath, GetEntryName());
+	int ret = ke::SafeSprintf(temppath, sizeof(temppath), "%s/%s", m_origpath, GetEntryName());
 	if (static_cast<size_t>(ret) >= sizeof(temppath))
 		return false;
 	return ke::file::IsFile(temppath);
diff --git a/core/logic/RootConsoleMenu.cpp b/core/logic/RootConsoleMenu.cpp
@@ -166,7 +166,7 @@ void RootConsoleMenu::DrawGenericOption(const char *cmd, const char *text)
 		{
 			buffer[len++] = ' ';
 		}
-		len += snprintf(&buffer[len], sizeof(buffer) - len, " - %s", text);
+		len += ke::SafeSprintf(&buffer[len], sizeof(buffer) - len, " - %s", text);
 		ConsolePrint("%s", buffer);
 	}
 }
diff --git a/core/logic/smn_filesystem.cpp b/core/logic/smn_filesystem.cpp
@@ -321,7 +321,7 @@ static cell_t sm_OpenDirectory(IPluginContext *pContext, const cell_t *params)
 	{
 		size_t len = strlen(path);
 		char wildcardedPath[PLATFORM_MAX_PATH];
-		snprintf(wildcardedPath, sizeof(wildcardedPath), "%s%s*", path, (path[len-1] != '/' && path[len-1] != '\\') ? "/" : "");
+		ke::SafeSprintf(wildcardedPath, sizeof(wildcardedPath), "%s%s*", path, (path[len-1] != '/' && path[len-1] != '\\') ? "/" : "");
 		
 		char *pathID;
 		if ((err=pContext->LocalToStringNULL(params[3], &pathID)) != SP_ERROR_NONE)
diff --git a/core/logic/smn_players.cpp b/core/logic/smn_players.cpp
@@ -397,7 +397,7 @@ static cell_t SteamIdToLocal(IPluginContext *pCtx, int index, AuthIdType authTyp
 			}
 			
 			char szAuth[64];
-			snprintf(szAuth, sizeof(szAuth), "%" PRIu64, steamId);
+			ke::SafeSprintf(szAuth, sizeof(szAuth), "%" PRIu64, steamId);
 			
 			pCtx->StringToLocal(local_addr, bytes, szAuth);
 		}
diff --git a/core/sourcemm_api.cpp b/core/sourcemm_api.cpp
@@ -110,7 +110,7 @@ bool SourceMod_Core::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen
 	{
 		if (error)
 		{
-			snprintf(error, maxlen, "Unable to find interface %s", MMIFACE_PLMANAGER);
+			ke::SafeSprintf(error, maxlen, "Unable to find interface %s", MMIFACE_PLMANAGER);
 		}
 		return false;
 	}
diff --git a/extensions/clientprefs/extension.cpp b/extensions/clientprefs/extension.cpp
@@ -66,7 +66,7 @@ bool ClientPrefs::SDK_OnLoad(char *error, size_t maxlength, bool late)
 	
 	if (DBInfo == NULL)
 	{
-		snprintf(error, maxlength, "Could not find any suitable database configs");
+		ke::SafeStrcpy(error, maxlength, "Could not find any suitable database configs");
 		return false;
 	}
 
@@ -81,7 +81,7 @@ bool ClientPrefs::SDK_OnLoad(char *error, size_t maxlength, bool late)
 
 	if (Driver == NULL)
 	{
-		snprintf(error, maxlength, "Could not load DB Driver \"%s\"", DBInfo->driver);
+		ke::SafeSprintf(error, maxlength, "Could not load DB Driver \"%s\"", DBInfo->driver);
 		return false;
 	}
 
diff --git a/extensions/cstrike/extension.cpp b/extensions/cstrike/extension.cpp
@@ -63,7 +63,7 @@ bool CStrike::SDK_OnLoad(char *error, size_t maxlength, bool late)
 #if SOURCE_ENGINE != SE_CSGO
 	if (strcmp(g_pSM->GetGameFolderName(), "cstrike") != 0)
 	{
-		snprintf(error, maxlength, "Cannot Load Cstrike Extension on mods other than CS:S and CS:GO");
+		ke::SafeStrcpy(error, maxlength, "Cannot Load Cstrike Extension on mods other than CS:S and CS:GO");
 		return false;
 	}
 #endif
@@ -76,7 +76,7 @@ bool CStrike::SDK_OnLoad(char *error, size_t maxlength, bool late)
 	{
 		if (error)
 		{
-			snprintf(error, maxlength, "Could not read sm-cstrike.games: %s", conf_error);
+			ke::SafeSprintf(error, maxlength, "Could not read sm-cstrike.games: %s", conf_error);
 		}
 		return false;
 	}
diff --git a/extensions/cstrike/util_cstrike.cpp b/extensions/cstrike/util_cstrike.cpp
@@ -357,7 +357,7 @@ ItemDefHashValue *GetHashValueFromWeapon(const char *szWeapon)
 {
 	char tempWeapon[MAX_WEAPON_NAME_LENGTH];
 
-	Q_strncpy(tempWeapon, szWeapon, sizeof(tempWeapon));
+	ke::SafeStrcpy(tempWeapon, sizeof(tempWeapon), szWeapon);
 	Q_strlower(tempWeapon);
 
 	if (strstr(tempWeapon, "weapon_") == NULL && strstr(tempWeapon, "item_") == NULL)
@@ -367,7 +367,7 @@ ItemDefHashValue *GetHashValueFromWeapon(const char *szWeapon)
 		for (unsigned int i = 0; i < SM_ARRAYSIZE(szClassPrefixs); i++)
 		{
 			char classname[MAX_WEAPON_NAME_LENGTH];
-			Q_snprintf(classname, sizeof(classname), "%s%s", szClassPrefixs[i], tempWeapon);
+			ke::SafeSprintf(classname, sizeof(classname), "%s%s", szClassPrefixs[i], tempWeapon);
 
 			ClassnameMap::Result res = g_mapClassToDefIdx.find(classname);
 
diff --git a/extensions/geoip/extension.cpp b/extensions/geoip/extension.cpp
@@ -32,6 +32,7 @@
 #include <sourcemod_version.h>
 #include "extension.h"
 #include "GeoIP.h"
+#include "am-string.h"
 
 /**
  * @file extension.cpp
@@ -51,7 +52,7 @@ bool GeoIP_Extension::SDK_OnLoad(char *error, size_t maxlength, bool late)
 
 	if (!gi)
 	{
-		snprintf(error, maxlength, "Could not load configs/geoip/GeoIP.dat");
+		ke::SafeStrcpy(error, maxlength, "Could not load configs/geoip/GeoIP.dat");
 		return false;
 	}
 
diff --git a/extensions/mysql/mysql/MyDriver.cpp b/extensions/mysql/mysql/MyDriver.cpp
@@ -32,6 +32,7 @@
 #include "MyDriver.h"
 #include "MyDatabase.h"
 #include "smsdk_ext.h"
+#include "am-string.h"
 
 MyDriver g_MyDriver;
 
@@ -133,7 +134,7 @@ MYSQL *Connect(const DatabaseInfo *info, char *error, size_t maxlength)
 		M_CLIENT_MULTI_RESULTS))
 	{
 		/* :TODO: expose UTIL_Format from smutil! */
-		snprintf(error, maxlength, "[%d]: %s", mysql_errno(mysql), mysql_error(mysql));
+		ke::SafeSprintf(error, maxlength, "[%d]: %s", mysql_errno(mysql), mysql_error(mysql));
 		mysql_close(mysql);
 		return NULL;
 	}
diff --git a/extensions/sdktools/extension.cpp b/extensions/sdktools/extension.cpp
@@ -46,6 +46,8 @@
 #include "clientnatives.h"
 #include "teamnatives.h"
 #include "filesystem.h"
+#include "am-string.h"
+
 /**
  * @file extension.cpp
  * @brief Implements SDK Tools extension code.
@@ -128,7 +130,7 @@ bool SDKTools::SDK_OnLoad(char *error, size_t maxlength, bool late)
 	g_CallHandle = handlesys->CreateType("ValveCall", this, 0, NULL, NULL, myself->GetIdentity(), &err);
 	if (g_CallHandle == 0)
 	{
-		snprintf(error, maxlength, "Could not create call handle type (err: %d)", err);	
+		ke::SafeSprintf(error, maxlength, "Could not create call handle type (err: %d)", err);	
 		return false;
 	}
 
@@ -142,7 +144,7 @@ bool SDKTools::SDK_OnLoad(char *error, size_t maxlength, bool late)
 	{
 		handlesys->RemoveType(g_CallHandle, myself->GetIdentity());
 		g_CallHandle = 0;
-		snprintf(error, maxlength, "Could not create traceray handle type (err: %d)", err);
+		ke::SafeSprintf(error, maxlength, "Could not create traceray handle type (err: %d)", err);
 		return false;
 	}
 
@@ -385,7 +387,7 @@ bool SDKTools::LevelInit(char const *pMapName, char const *pMapEntities, char co
 
 	while (n <= count)
 	{
-		snprintf(key, sizeof(key), "SlapSound%d", n);
+		ke::SafeSprintf(key, sizeof(key), "SlapSound%d", n);
 		if ((name=g_pGameConf->GetKeyValue(key)))
 		{
 			engsound->PrecacheSound(name, true);
@@ -436,7 +438,7 @@ bool SDKTools::ProcessCommandTarget(cmd_target_info_t *info)
 		info->num_targets = 1;
 		info->reason = COMMAND_TARGET_VALID;
 		info->target_name_style = COMMAND_TARGETNAME_RAW;
-		snprintf(info->target_name, info->target_name_maxlength, "%s", pTarget->GetName());
+		ke::SafeStrcpy(info->target_name, info->target_name_maxlength, pTarget->GetName());
 		return true;
 	}
 	else if (strcmp(info->pattern, "@spec") == 0)
@@ -462,7 +464,7 @@ bool SDKTools::ProcessCommandTarget(cmd_target_info_t *info)
 		}
 		info->reason = info->num_targets > 0 ? COMMAND_TARGET_VALID : COMMAND_TARGET_EMPTY_FILTER;
 		info->target_name_style = COMMAND_TARGETNAME_ML;
-		snprintf(info->target_name, info->target_name_maxlength, "all spectators");
+		ke::SafeStrcpy(info->target_name, info->target_name_maxlength, "all spectators");
 		return true;
 	}
 
diff --git a/extensions/sdktools/output.cpp b/extensions/sdktools/output.cpp
@@ -31,6 +31,7 @@
 
 #include "extension.h"
 #include "output.h"
+#include "am-string.h"
 
 ISourcePawnEngine *spengine = NULL;
 EntityOutputManager g_OutputManager;
@@ -120,7 +121,7 @@ bool EntityOutputManager::FireEventDetour(void *pOutput, CBaseEntity *pActivator
 	}
 
 	char sOutput[20];
-	Q_snprintf(sOutput, sizeof(sOutput), "%p", pOutput);
+	ke::SafeSprintf(sOutput, sizeof(sOutput), "%p", pOutput);
 
 	// attempt to directly lookup a hook using the pOutput pointer
 	OutputNameStruct *pOutputName = NULL;
diff --git a/extensions/sdktools/vnatives.cpp b/extensions/sdktools/vnatives.cpp
@@ -40,6 +40,7 @@
 #include <inetchannel.h>
 #include <iclient.h>
 #include "iserver.h"
+#include "am-string.h"
 
 SourceHook::List<ValveCall *> g_RegCalls;
 SourceHook::List<ICallWrapper *> g_CallWraps;
@@ -623,7 +624,7 @@ static cell_t SlapPlayer(IPluginContext *pContext, const cell_t *params)
 		int maxClients = playerhelpers->GetMaxClients();
 
 		int r = (rand() % s_sound_count) + 1;
-		snprintf(name, sizeof(name), "SlapSound%d", r);
+		ke::SafeSprintf(name, sizeof(name), "SlapSound%d", r);
 
 		if ((sound_name = g_pGameConf->GetKeyValue(name)) != NULL)
 		{
diff --git a/public/IExtensionSys.h b/public/IExtensionSys.h
@@ -34,6 +34,7 @@
 
 #include <IShareSys.h>
 #include <ILibrarySys.h>
+#include "am-string.h"
 
 /**
  * @file IExtensionSys.h
@@ -443,7 +444,7 @@ namespace SourceMod
 		{ \
 			if (errbuf) \
 			{ \
-				size_t len = snprintf(errbuf, \
+				size_t len = ke::SafeSprintf(errbuf, \
 					errsize, \
 					"Could not find interface: %s (version: %d)", \
 					SM_IFACEPAIR(prefix)); \
diff --git a/public/smsdk_ext.cpp b/public/smsdk_ext.cpp
diff --git a/public/smsdk_ext.h b/public/smsdk_ext.h

Original file line number	Diff line number	Diff line change
`@@ -2050,18 +2050,18 @@ void CPlayer::UpdateAuthIds()`
`2050`	`2050`	`}`
`2051`	`2051`
`2052`	`2052`	`char szAuthBuffer[64];`
`2053`		`- snprintf(szAuthBuffer, sizeof(szAuthBuffer), "STEAM_%u:%u:%u", steam2universe, m_SteamId.GetAccountID() & 1, m_SteamId.GetAccountID() >> 1);`
	`2053`	`+ ke::SafeSprintf(szAuthBuffer, sizeof(szAuthBuffer), "STEAM_%u:%u:%u", steam2universe, m_SteamId.GetAccountID() & 1, m_SteamId.GetAccountID() >> 1);`
`2054`	`2054`
`2055`	`2055`	`m_Steam2Id = szAuthBuffer;`
`2056`	`2056`
`2057`	`2057`	`// TODO: make sure all hl2sdks' steamclientpublic.h have k_unSteamUserDesktopInstance.`
`2058`	`2058`	`if (m_SteamId.GetUnAccountInstance() == 1 /* k_unSteamUserDesktopInstance */)`
`2059`	`2059`	`{`
`2060`		`- snprintf(szAuthBuffer, sizeof(szAuthBuffer), "[U:%u:%u]", m_SteamId.GetEUniverse(), m_SteamId.GetAccountID());`
	`2060`	`+ ke::SafeSprintf(szAuthBuffer, sizeof(szAuthBuffer), "[U:%u:%u]", m_SteamId.GetEUniverse(), m_SteamId.GetAccountID());`
`2061`	`2061`	`}`
`2062`	`2062`	`else`
`2063`	`2063`	`{`
`2064`		`- snprintf(szAuthBuffer, sizeof(szAuthBuffer), "[U:%u:%u:%u]", m_SteamId.GetEUniverse(), m_SteamId.GetAccountID(), m_SteamId.GetUnAccountInstance());`
	`2064`	`+ ke::SafeSprintf(szAuthBuffer, sizeof(szAuthBuffer), "[U:%u:%u:%u]", m_SteamId.GetEUniverse(), m_SteamId.GetAccountID(), m_SteamId.GetUnAccountInstance());`
`2065`	`2065`	`}`
`2066`	`2066`
`2067`	`2067`	`m_Steam3Id = szAuthBuffer;`
Original file line number	Diff line number	Diff line change
`@@ -1090,14 +1090,14 @@ bool AdminCache::GetUnifiedSteamIdentity(const char ident, char out, size_t ma`
`1090`	`1090`	`else if (len >= 11 && !strncmp(ident, "STEAM_", 6) && ident[8] != '_')`
`1091`	`1091`	`{`
`1092`	`1092`	`// non-bot/lan Steam2 Id, strip off the STEAM_* part`
`1093`		`- snprintf(out, maxlen, "%s", &ident[8]);`
	`1093`	`+ ke::SafeStrcpy(out, maxlen, &ident[8]);`
`1094`	`1094`	`return true;`
`1095`	`1095`	`}`
`1096`	`1096`	`else if (len >= 7 && !strncmp(ident, "[U:", 3) && ident[len-1] == ']')`
`1097`	`1097`	`{`
`1098`	`1098`	`// Steam3 Id, replicate the Steam2 Post-"STEAM_" part`
`1099`	`1099`	`uint32_t accountId = strtoul(&ident[5], nullptr, 10);`
`1100`		`- snprintf(out, maxlen, "%u:%u", accountId & 1, accountId >> 1);`
	`1100`	`+ ke::SafeSprintf(out, maxlen, "%u:%u", accountId & 1, accountId >> 1);`
`1101`	`1101`	`return true;`
`1102`	`1102`	`}`
`1103`	`1103`	`else`
`@@ -1124,7 +1124,7 @@ bool AdminCache::GetUnifiedSteamIdentity(const char ident, char out, size_t ma`
`1124`	`1124`	`&& accountType == k_EAccountTypeIndividual && accountInstance <= k_unSteamUserWebInstance`
`1125`	`1125`	`)`
`1126`	`1126`	`{`
`1127`		`- snprintf(out, maxlen, "%u:%u", accountId & 1, accountId >> 1);`
	`1127`	`+ ke::SafeSprintf(out, maxlen, "%u:%u", accountId & 1, accountId >> 1);`
`1128`	`1128`	`return true;`
`1129`	`1129`	`}`
`1130`	`1130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ bool CLocalExtension::Load(char *error, size_t maxlength)`
`176`	`176`	`{`
`177`	`177`	`m_pLib->CloseLibrary();`
`178`	`178`	`m_pLib = NULL;`
`179`		`- snprintf(error, maxlength, "Unable to find extension entry point");`
	`179`	`+ ke::SafeStrcpy(error, maxlength, "Unable to find extension entry point");`
`180`	`180`	`return false;`
`181`	`181`	`}`
`182`	`182`
`@@ -246,7 +246,7 @@ void CLocalExtension::Unload()`
`246`	`246`
`247`	`247`	`bool CRemoteExtension::Reload(char *error, size_t maxlength)`
`248`	`248`	`{`
`249`		`- snprintf(error, maxlength, "Remote extensions do not support reloading");`
	`249`	`+ ke::SafeStrcpy(error, maxlength, "Remote extensions do not support reloading");`
`250`	`250`	`return false;`
`251`	`251`	`}`
`252`	`252`
`@@ -280,13 +280,13 @@ bool CExtension::PerformAPICheck(char *error, size_t maxlength)`
`280`	`280`	`{`
`281`	`281`	`if (!m_pAPI)`
`282`	`282`	`{`
`283`		`- snprintf(error, maxlength, "No IExtensionInterface instance provided");`
	`283`	`+ ke::SafeStrcpy(error, maxlength, "No IExtensionInterface instance provided");`
`284`	`284`	`return false;`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`if (m_pAPI->GetExtensionVersion() > SMINTERFACE_EXTENSIONAPI_VERSION)`
`288`	`288`	`{`
`289`		`- snprintf(error, maxlength, "Extension version is too new to load (%d, max is %d)", m_pAPI->GetExtensionVersion(), SMINTERFACE_EXTENSIONAPI_VERSION);`
	`289`	`+ ke::SafeSprintf(error, maxlength, "Extension version is too new to load (%d, max is %d)", m_pAPI->GetExtensionVersion(), SMINTERFACE_EXTENSIONAPI_VERSION);`
`290`	`290`	`return false;`
`291`	`291`	`}`
`292`	`292`
`@@ -493,7 +493,7 @@ bool CExtension::IsRunning(char *error, size_t maxlength)`
`493`	`493`	`{`
`494`	`494`	`if (error)`
`495`	`495`	`{`
`496`		`- snprintf(error, maxlength, "%s", m_Error.c_str());`
	`496`	`+ ke::SafeStrcpy(error, maxlength, m_Error.c_str());`
`497`	`497`	`}`
`498`	`498`	`return false;`
`499`	`499`	`}`
`@@ -1136,7 +1136,7 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const ICommand`
`1136`	`1136`	`if (pExt->unload_code == (unsigned)atoi(unload))`
`1137`	`1137`	`{`
`1138`	`1138`	`char filename[PLATFORM_MAX_PATH];`
`1139`		`- snprintf(filename, PLATFORM_MAX_PATH, "%s", pExt->GetFilename());`
	`1139`	`+ ke::SafeStrcpy(filename, PLATFORM_MAX_PATH, pExt->GetFilename());`
`1140`	`1140`	`UnloadExtension(pExt);`
`1141`	`1141`	`rootmenu->ConsolePrint("[SM] Extension %s is now unloaded.", filename);`
`1142`	`1142`	`}`
`@@ -1151,7 +1151,7 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const ICommand`
`1151`	`1151`	`\|\| (!pExt->m_ChildDeps.size() && !pExt->m_Dependents.size()))`
`1152`	`1152`	`{`
`1153`	`1153`	`char filename[PLATFORM_MAX_PATH];`
`1154`		`- snprintf(filename, PLATFORM_MAX_PATH, "%s", pExt->GetFilename());`
	`1154`	`+ ke::SafeStrcpy(filename, PLATFORM_MAX_PATH, pExt->GetFilename());`
`1155`	`1155`	`UnloadExtension(pExt);`
`1156`	`1156`	`rootmenu->ConsolePrint("[SM] Extension %s is now unloaded.", filename);`
`1157`	`1157`	`return;`
`@@ -1252,7 +1252,7 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const ICommand`
`1252`	`1252`	`char filename[PLATFORM_MAX_PATH];`
`1253`	`1253`	`char error[255];`
`1254`	`1254`
`1255`		`- snprintf(filename, PLATFORM_MAX_PATH, "%s", pExt->GetFilename());`
	`1255`	`+ ke::SafeStrcpy(filename, PLATFORM_MAX_PATH, pExt->GetFilename());`
`1256`	`1256`
`1257`	`1257`	`if (pExt->Reload(error, sizeof(error)))`
`1258`	`1258`	`{`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ void RootConsoleMenu::DrawGenericOption(const char cmd, const char text)`
`166`	`166`	`{`
`167`	`167`	`buffer[len++] = ' ';`
`168`	`168`	`}`
`169`		`- len += snprintf(&buffer[len], sizeof(buffer) - len, " - %s", text);`
	`169`	`+ len += ke::SafeSprintf(&buffer[len], sizeof(buffer) - len, " - %s", text);`
`170`	`170`	`ConsolePrint("%s", buffer);`
`171`	`171`	`}`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ static cell_t sm_OpenDirectory(IPluginContext pContext, const cell_t params)`
`321`	`321`	`{`
`322`	`322`	`size_t len = strlen(path);`
`323`	`323`	`char wildcardedPath[PLATFORM_MAX_PATH];`
`324`		`- snprintf(wildcardedPath, sizeof(wildcardedPath), "%s%s*", path, (path[len-1] != '/' && path[len-1] != '\\') ? "/" : "");`
	`324`	`+ ke::SafeSprintf(wildcardedPath, sizeof(wildcardedPath), "%s%s*", path, (path[len-1] != '/' && path[len-1] != '\\') ? "/" : "");`
`325`	`325`
`326`	`326`	`char *pathID;`
`327`	`327`	`if ((err=pContext->LocalToStringNULL(params[3], &pathID)) != SP_ERROR_NONE)`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ static cell_t SteamIdToLocal(IPluginContext *pCtx, int index, AuthIdType authTyp`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`char szAuth[64];`
`400`		`- snprintf(szAuth, sizeof(szAuth), "%" PRIu64, steamId);`
	`400`	`+ ke::SafeSprintf(szAuth, sizeof(szAuth), "%" PRIu64, steamId);`
`401`	`401`
`402`	`402`	`pCtx->StringToLocal(local_addr, bytes, szAuth);`
`403`	`403`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ bool SourceMod_Core::Load(PluginId id, ISmmAPI ismm, char error, size_t maxlen`
`110`	`110`	`{`
`111`	`111`	`if (error)`
`112`	`112`	`{`
`113`		`- snprintf(error, maxlen, "Unable to find interface %s", MMIFACE_PLMANAGER);`
	`113`	`+ ke::SafeSprintf(error, maxlen, "Unable to find interface %s", MMIFACE_PLMANAGER);`
`114`	`114`	`}`
`115`	`115`	`return false;`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ bool ClientPrefs::SDK_OnLoad(char *error, size_t maxlength, bool late)`
`66`	`66`
`67`	`67`	`if (DBInfo == NULL)`
`68`	`68`	`{`
`69`		`- snprintf(error, maxlength, "Could not find any suitable database configs");`
	`69`	`+ ke::SafeStrcpy(error, maxlength, "Could not find any suitable database configs");`
`70`	`70`	`return false;`
`71`	`71`	`}`
`72`	`72`
`@@ -81,7 +81,7 @@ bool ClientPrefs::SDK_OnLoad(char *error, size_t maxlength, bool late)`
`81`	`81`
`82`	`82`	`if (Driver == NULL)`
`83`	`83`	`{`
`84`		`- snprintf(error, maxlength, "Could not load DB Driver \"%s\"", DBInfo->driver);`
	`84`	`+ ke::SafeSprintf(error, maxlength, "Could not load DB Driver \"%s\"", DBInfo->driver);`
`85`	`85`	`return false;`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ bool CStrike::SDK_OnLoad(char *error, size_t maxlength, bool late)`
`63`	`63`	`#if SOURCE_ENGINE != SE_CSGO`
`64`	`64`	`if (strcmp(g_pSM->GetGameFolderName(), "cstrike") != 0)`
`65`	`65`	`{`
`66`		`- snprintf(error, maxlength, "Cannot Load Cstrike Extension on mods other than CS:S and CS:GO");`
	`66`	`+ ke::SafeStrcpy(error, maxlength, "Cannot Load Cstrike Extension on mods other than CS:S and CS:GO");`
`67`	`67`	`return false;`
`68`	`68`	`}`
`69`	`69`	`#endif`
`@@ -76,7 +76,7 @@ bool CStrike::SDK_OnLoad(char *error, size_t maxlength, bool late)`
`76`	`76`	`{`
`77`	`77`	`if (error)`
`78`	`78`	`{`
`79`		`- snprintf(error, maxlength, "Could not read sm-cstrike.games: %s", conf_error);`
	`79`	`+ ke::SafeSprintf(error, maxlength, "Could not read sm-cstrike.games: %s", conf_error);`
`80`	`80`	`}`
`81`	`81`	`return false;`
`82`	`82`	`}`