Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bad ptr checks for strings

Browse Source
This commit is contained in:
David Anderson 2006-02-11 22:56:55 +00:00
parent 2c8808aaff
commit 48d3b6e952
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/fakemeta/pdata.cpp
View File

@ -1,5 +1,20 @@
#include "fakemeta_amxx.h" #include "fakemeta_amxx.h"
#if defined WIN32
#define WINDOWS_LEAN_AND_MEAN
#include <windows.h>
#else
//implement these with setjmp later.
bool IsBadReadPtr(void *l, size_t size)
{
return false;
}
bool IsBadWritePtr(void *l, size_t size)
{
return false;
}
#endif
static cell AMX_NATIVE_CALL set_pdata_int(AMX *amx, cell *params) static cell AMX_NATIVE_CALL set_pdata_int(AMX *amx, cell *params)
{ {
int index=params[1]; int index=params[1];
@ -76,8 +91,14 @@ static cell AMX_NATIVE_CALL get_pdata_string(AMX *amx, cell *params)
szData = (char *)pEdict->pvPrivateData + iOffset; szData = (char *)pEdict->pvPrivateData + iOffset;
} }
return MF_SetAmxString(amx, params[3], szData, params[4]); if (IsBadReadPtr(szData, 1))
{
return 0;
}
MF_SetAmxString(amx, params[3], szData, params[4]);
return 1;
} }
static cell AMX_NATIVE_CALL set_pdata_string(AMX *amx, cell *params) static cell AMX_NATIVE_CALL set_pdata_string(AMX *amx, cell *params)
@ -100,9 +121,13 @@ static cell AMX_NATIVE_CALL set_pdata_string(AMX *amx, cell *params)
if (params[4] == -1) if (params[4] == -1)
{ {
szData = (char *)pEdict->pvPrivateData + iOffset; szData = (char *)pEdict->pvPrivateData + iOffset;
if (IsBadWritePtr(szData, 1))
return 0;
strcpy(szData, data); strcpy(szData, data);
} else { } else {
szData = *((char **)pEdict->pvPrivateData + iOffset); szData = *((char **)pEdict->pvPrivateData + iOffset);
if (IsBadWritePtr(szData, 1))
return 0;
if (params[4] == 1) if (params[4] == 1)
{ {
free(szData); free(szData);