UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a serious potential corruption bug

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40301
This commit is contained in:
David Anderson 2007-01-16 19:03:29 +00:00
parent c97d129c4d
commit 5366d05ce2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/systems/CFunction.cpp
View File

@ -90,7 +90,7 @@ int CFunction::PushArray(cell_t *inarray, unsigned int cells, cell_t **phys_addr
info->flags = inarray ? copyback : 0; info->flags = inarray ? copyback : 0;
info->marked = true; info->marked = true;
info->size = cells; info->size = cells * sizeof(cell_t);
m_params[m_curparam] = info->local_addr; m_params[m_curparam] = info->local_addr;
m_curparam++; m_curparam++;
@ -162,7 +162,7 @@ int CFunction::_PushString(const char *string, int sz_flags, int cp_flags, size_
skip_localtostr: skip_localtostr:
info->flags = cp_flags; info->flags = cp_flags;
info->orig_addr = (cell_t *)string; info->orig_addr = (cell_t *)string;
info->size = cells; info->size = len;
return SP_ERROR_NONE; return SP_ERROR_NONE;
} }
@ -229,13 +229,13 @@ int CFunction::Execute(cell_t *result)
{ {
if (temp_info[numparams].orig_addr) if (temp_info[numparams].orig_addr)
{ {
if (temp_info[numparams].size == 1) if (temp_info[numparams].size == sizeof(cell_t))
{ {
*temp_info[numparams].orig_addr = *temp_info[numparams].phys_addr; *temp_info[numparams].orig_addr = *temp_info[numparams].phys_addr;
} else { } else {
memcpy(temp_info[numparams].orig_addr, memcpy(temp_info[numparams].orig_addr,
temp_info[numparams].phys_addr, temp_info[numparams].phys_addr,
temp_info[numparams].size * sizeof(cell_t)); temp_info[numparams].size);
} }
} }
} }

2
core/systems/CFunction.h
View File

@ -11,7 +11,7 @@ struct ParamInfo
cell_t local_addr; /* Local address to free */ cell_t local_addr; /* Local address to free */
cell_t *phys_addr; /* Physical address of our copy */ cell_t *phys_addr; /* Physical address of our copy */
cell_t *orig_addr; /* Original address to copy back to */ cell_t *orig_addr; /* Original address to copy back to */
ucell_t size; /* Size of array in cells */ ucell_t size; /* Size of array in bytes */
}; };
class CPlugin; class CPlugin;