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

Make datapack natives error consistently, stop using IsPackReadable

Browse Source
This commit is contained in:
Valentin Grünbacher 2015-03-28 14:04:50 +01:00
parent 1d57677426
commit 2166c32047
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
amxmodx/datapacks.cpp
View File

@ -94,9 +94,9 @@ static cell AMX_NATIVE_CALL ReadPackCell(AMX* amx, cell* params)
return 0; return 0;
} }
if (!d->IsReadable(sizeof(char) + sizeof(size_t) + sizeof(cell))) if (!d->CanReadCell())
{ {
LogError(amx, AMX_ERR_NATIVE, "DataPack operation is out of bounds."); LogError(amx, AMX_ERR_NATIVE, "Datapack operation is invalid.");
return 0; return 0;
} }
@ -113,9 +113,9 @@ static cell AMX_NATIVE_CALL ReadPackFloat(AMX* amx, cell* params)
return 0; return 0;
} }
if (!d->IsReadable(sizeof(char) + sizeof(size_t) + sizeof(float))) if (!d->CanReadFloat())
{ {
LogError(amx, AMX_ERR_NATIVE, "DataPack operation is out of bounds."); LogError(amx, AMX_ERR_NATIVE, "Datapack operation is invalid.");
return 0; return 0;
} }
@ -134,14 +134,15 @@ static cell AMX_NATIVE_CALL ReadPackString(AMX* amx, cell* params)
return 0; return 0;
} }
const char *str; if (!d->CanReadString(NULL))
size_t len;
if (!(str = d->ReadString(&len)))
{ {
LogError(amx, AMX_ERR_NATIVE, "DataPack operation is out of bounds."); LogError(amx, AMX_ERR_NATIVE, "Datapack operation is invalid.");
return 0; return 0;
} }
size_t len;
const char *str = d->ReadString(&len);
return set_amxstring_utf8(amx, params[2], str, len, params[3] + 1); // + EOS return set_amxstring_utf8(amx, params[2], str, len, params[3] + 1); // + EOS
} }