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

Fixed long strings with internal static copybacks causing buffer overflows (bug amb1986).

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%402518
This commit is contained in:
David Anderson 2008-09-07 03:24:51 +00:00
parent 1ec936daf6
commit 681747d02c
1 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
core/smn_string.cpp
View File

@ -192,7 +192,31 @@ static cell_t sm_formatex(IPluginContext *pCtx, const cell_t *params)
return static_cast<cell_t>(res); return static_cast<cell_t>(res);
} }
class StaticCharBuf
{
char *buffer;
size_t max_size;
public:
StaticCharBuf() : buffer(NULL), max_size(0)
{
}
~StaticCharBuf()
{
delete [] buffer;
}
char* GetWithSize(size_t len)
{
if (len > max_size)
{
buffer = (char *)realloc(buffer, len);
max_size = len;
}
return buffer;
}
};
static char g_formatbuf[2048]; static char g_formatbuf[2048];
static StaticCharBuf g_extrabuf;
static cell_t sm_format(IPluginContext *pCtx, const cell_t *params) static cell_t sm_format(IPluginContext *pCtx, const cell_t *params)
{ {
char *buf, *fmt, *destbuf; char *buf, *fmt, *destbuf;
@ -200,6 +224,7 @@ static cell_t sm_format(IPluginContext *pCtx, const cell_t *params)
size_t res, maxlen; size_t res, maxlen;
int arg = 4; int arg = 4;
bool copy = false; bool copy = false;
char *__copy_buf;
pCtx->LocalToString(params[1], &destbuf); pCtx->LocalToString(params[1], &destbuf);
pCtx->LocalToString(params[3], &fmt); pCtx->LocalToString(params[3], &fmt);
@ -217,12 +242,25 @@ static cell_t sm_format(IPluginContext *pCtx, const cell_t *params)
break; break;
} }
} }
buf = (copy) ? g_formatbuf : destbuf;
if (copy)
{
if (maxlen > sizeof(g_formatbuf))
{
__copy_buf = g_extrabuf.GetWithSize(maxlen);
}
else
{
__copy_buf = g_formatbuf;
}
}
buf = (copy) ? __copy_buf : destbuf;
res = atcprintf(buf, maxlen, fmt, pCtx, params, &arg); res = atcprintf(buf, maxlen, fmt, pCtx, params, &arg);
if (copy) if (copy)
{ {
memcpy(destbuf, g_formatbuf, res+1); memcpy(destbuf, __copy_buf, res+1);
} }
return static_cast<cell_t>(res); return static_cast<cell_t>(res);