Skip to content

fix: use Database.Format for SQL escaping instead of manual Escape #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rushaway wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: use Database.Format for SQL escaping instead of manual Escape #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/sourcemod/scripting/VIP_Core.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <clientprefs>

#if !defined VIP_VERSION
#define VIP_VERSION "3.1.1 R"
#define VIP_VERSION "3.1.2 R"
#endif


Expand Down
7 changes: 3 additions & 4 deletions addons/sourcemod/scripting/vip/Database.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,9 @@ void DB_UpdateClient(int iClient, const char[] szDbName = NULL_STRING)

if (g_CVAR_bUpdateName || !strcmp(szDbName, "unknown"))
{
char szName[MNL*2+1];
GetClientName(iClient, szQuery, MNL);
g_hDatabase.Escape(szQuery, SZF(szName));
FormatEx(SZF(szQuery), "UPDATE `vip_users` SET `name` = '%s', `lastvisit` = %d WHERE `account_id` = %d%s;", szName, GetTime(), iClientID, g_szSID);
char szName[MNL];
GetClientName(iClient, SZF(szName));
g_hDatabase.Format(SZF(szQuery), "UPDATE `vip_users` SET `name` = '%s', `lastvisit` = %d WHERE `account_id` = %d%s;", szName, GetTime(), iClientID, g_szSID);
}
else
{
Expand Down
18 changes: 8 additions & 10 deletions addons/sourcemod/scripting/vip/UTIL.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ void UTIL_ADD_VIP_PLAYER(int iAdmin = 0,
const char[] szGroup,
const char[] szByWho = NULL_STRING)
{
char szQuery[PMP*2], szName[MNL*2+1];
char szQuery[PMP*2], szName[MNL];
char szAdmin[PMP], szTargetInfo[PMP];
int iExpires, iAccountID;

Expand All @@ -292,11 +292,10 @@ void UTIL_ADD_VIP_PLAYER(int iAdmin = 0,
{
iExpires = iDuration;
}

if (iTarget)
{
GetClientName(iTarget, SZF(szQuery));
g_hDatabase.Escape(szQuery, SZF(szName));
GetClientName(iTarget, SZF(szName));
iAccountID = GetSteamAccountID(iTarget);
UTIL_GetClientInfo(iTarget, SZF(szTargetInfo));
}
Expand Down Expand Up @@ -353,7 +352,7 @@ void UTIL_ADD_VIP_PLAYER(int iAdmin = 0,

if (GLOBAL_INFO & IS_MySQL)
{
FormatEx(SZF(szQuery), "INSERT INTO `vip_users` (`account_id`, `sid`, `expires`, `group`, `name`, `lastvisit`) VALUES (%d, %d, %d, '%s', '%s', %d) \
g_hDatabase.Format(SZF(szQuery), "INSERT INTO `vip_users` (`account_id`, `sid`, `expires`, `group`, `name`, `lastvisit`) VALUES (%d, %d, %d, '%s', '%s', %d) \
ON DUPLICATE KEY UPDATE `group` = VALUES(`group`), `expires` = IF(`expires` = 0, 0, IF(`expires` <= UNIX_TIMESTAMP(), VALUES(`expires`), `expires` + %d));",
iAccountID, g_CVAR_iServerID, iExpires, szGroup, szName, iLastVisit, iDuration);
DBG_SQL_Query(szQuery)
Expand All @@ -362,7 +361,7 @@ void UTIL_ADD_VIP_PLAYER(int iAdmin = 0,
return;
}

FormatEx(SZF(szQuery), "INSERT INTO `vip_users` (`account_id`, `name`, `expires`, `group`, `lastvisit`) VALUES (%d, '%s', %d, '%s', %d) \
g_hDatabase.Format(SZF(szQuery), "INSERT INTO `vip_users` (`account_id`, `name`, `expires`, `group`, `lastvisit`) VALUES (%d, '%s', %d, '%s', %d) \
ON CONFLICT (`account_id`) DO UPDATE SET \
`group` = excluded.`group` \
`expires` = CASE \
Expand All @@ -382,7 +381,7 @@ void UTIL_SET_VIP_PLAYER(int iAdmin = 0,
const char[] szGroup,
const char[] szByWho = NULL_STRING)
{
char szQuery[PMP*2], szName[MNL*2+1];
char szQuery[PMP*2], szName[MNL];
char szAdmin[PMP], szTargetInfo[PMP];
int iExpires, iAccountID;

Expand All @@ -394,11 +393,10 @@ void UTIL_SET_VIP_PLAYER(int iAdmin = 0,
{
iExpires = iDuration;
}

if (iTarget)
{
GetClientName(iTarget, SZF(szQuery));
g_hDatabase.Escape(szQuery, SZF(szName));
GetClientName(iTarget, SZF(szName));
iAccountID = GetSteamAccountID(iTarget);
UTIL_GetClientInfo(iTarget, SZF(szTargetInfo));
}
Expand Down