Skip to content

Fix SetHamItemInfo string memory handling #1128

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix SetHamItemInfo string memory handling #1128

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdbd80c
Fix SetHamItemInfo string memory handling
dystopm Aug 20, 2025
e754457
Fix string compilation
dystopm Aug 20, 2025
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
10 changes: 7 additions & 3 deletions modules/hamsandwich/DataHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@ static cell AMX_NATIVE_CALL SetHamItemInfo(AMX *amx, cell *params)
ItemInfo *pItem = reinterpret_cast<ItemInfo *>(params[1]);
cell *ptr = MF_GetAmxAddr(amx, params[3]);
int iLen;
char *szString;

switch (params[2])
{
Expand All @@ -420,23 +421,26 @@ static cell AMX_NATIVE_CALL SetHamItemInfo(AMX *amx, cell *params)
break;

case ItemInfo_pszAmmo1:
pItem->pszAmmo1 = MF_GetAmxString(amx, params[3], 0, &iLen);
szString = MF_GetAmxString(amx, params[3], 0, &iLen);
pItem->pszAmmo1 = szString ? STRING(ALLOC_STRING(szString)) : nullptr;
return iLen;

case ItemInfo_iMaxAmmo1:
pItem->iMaxAmmo1 = *ptr;
break;

case ItemInfo_pszAmmo2:
pItem->pszAmmo2 = MF_GetAmxString(amx, params[3], 0, &iLen);
szString = MF_GetAmxString(amx, params[3], 0, &iLen);
pItem->pszAmmo2 = szString ? STRING(ALLOC_STRING(szString)) : nullptr;
return iLen;

case ItemInfo_iMaxAmmo2:
pItem->iMaxAmmo2 = *ptr;
break;

case ItemInfo_pszName:
pItem->pszName = MF_GetAmxString(amx, params[3], 0, &iLen);
szString = MF_GetAmxString(amx, params[3], 0, &iLen);
pItem->pszName = szString ? STRING(ALLOC_STRING(szString)) : nullptr;
return iLen;

case ItemInfo_iMaxClip:
Expand Down
Loading