dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r26776) -Codechange: use safe string functions in script/squirrel*.cpp

Browse Source
This commit is contained in:
rubidium
2014-09-06 19:28:09 +00:00
parent e63ca12ab8
commit 962c1a3242
2 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/script/squirrel.cpp
View File

@@ -19,14 +19,7 @@
#include <../squirrel/sqpcheader.h>
#include <../squirrel/sqvm.h>
/* Due to the different characters for Squirrel, the scsnprintf might be a simple
* snprint which triggers the safeguard. But it isn't always a simple snprintf.
* Likewise for scvsnprintf and scstrcat.
* TODO: use properly safe functions now that Squirrel uses chars exclusively. */
#include "../safeguards.h"
#undef snprintf
#undef vsnprintf
#undef strcat
void Squirrel::CompileError(HSQUIRRELVM vm, const SQChar *desc, const SQChar *source, SQInteger line, SQInteger column)
{
@@ -51,7 +44,7 @@ void Squirrel::ErrorPrintFunc(HSQUIRRELVM vm, const SQChar *s, ...)
SQChar buf[1024];
va_start(arglist, s);
vsnprintf(buf, lengthof(buf), s, arglist);
vseprintf(buf, lastof(buf), s, arglist);
va_end(arglist);
/* Check if we have a custom print function */
@@ -107,9 +100,9 @@ void Squirrel::PrintFunc(HSQUIRRELVM vm, const SQChar *s, ...)
SQChar buf[1024];
va_start(arglist, s);
vsnprintf(buf, lengthof(buf) - 2, s, arglist);
vseprintf(buf, lastof(buf) - 2, s, arglist);
va_end(arglist);
strcat(buf, "\n");
strecat(buf, "\n", lastof(buf));
/* Check if we have a custom print function */
SQPrintFunc *func = ((Squirrel *)sq_getforeignptr(vm))->print_func;