Skip to content

fix: bugs in message and netadr natives #390

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

fix: bugs in message and netadr natives #390

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
4 changes: 2 additions & 2 deletions reapi/src/natives/natives_hookmessage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "precompiled.h"

#define CHECK_PARAMBOUNDS(x, y) if (unlikely(x > (size_t)y)) { AMXX_LogError(amx, AMX_ERR_NATIVE, "%s: invalid message argument %d/max:%d", __FUNCTION__, x, y); }
#define CHECK_PARAMBOUNDS(x, y) if (unlikely(x > (size_t)y)) { AMXX_LogError(amx, AMX_ERR_NATIVE, "%s: invalid message argument %d/max:%d", __FUNCTION__, x, y); return FALSE; }

enum MessageHook
{
Expand Down Expand Up @@ -320,7 +320,7 @@ cell AMX_NATIVE_CALL GetMessageOrigData(AMX *amx, cell *params)
case IMessage::DataType::Dest:
return static_cast<cell>(g_activeMessageContext->getOriginalDest());
case IMessage::DataType::Index:
return g_activeMessageContext->getId();
return g_activeMessageContext->getOriginalId();
case IMessage::DataType::Origin:
*(Vector *)getAmxAddr(amx, params[arg_value]) = g_activeMessageContext->getOriginalOrigin();
return TRUE;
Expand Down
4 changes: 2 additions & 2 deletions reapi/src/natives/natives_members.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ cell AMX_NATIVE_CALL set_netadr(AMX *amx, cell *params)
adr->port = ntohs(params[arg_value] & 0xFFFF); // cap short
break;
case netadr_ip:
*(size_t *)adr->ip = htonl(params[arg_value] & 0xFFFFFFFF); // cap int
*(unsigned int *)adr->ip = htonl(params[arg_value] & 0xFFFFFFFF); // cap int
break;
default:
return FALSE;
Expand Down Expand Up @@ -812,7 +812,7 @@ cell AMX_NATIVE_CALL get_netadr(AMX *amx, cell *params)
setAmxString(dest, NET_AdrToString(*adr, true /*no port*/), length);
}

return htonl(*(size_t *)adr->ip);
return htonl(*(unsigned int *)adr->ip);
}
default:
break;
Expand Down
Loading