thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-02-20 19:57:12 +01:00
Code Releases Activity

Make builtin formatted strings default to false to avoid trying to perform a format in cases where it can be folled by a following parameters that are not meant to be part of that formatted string.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2017-06-18 20:25:12 +03:00
parent bb7a6881c6
commit 7bb44ec008
15 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sqrat/sqratUtil.h
View File

@ -1510,7 +1510,7 @@ struct StackStrF
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// Base constructor.
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
StackStrF(HSQUIRRELVM vm, SQInteger idx, bool fmt = true, bool dummy = false)
StackStrF(HSQUIRRELVM vm, SQInteger idx, bool fmt = false, bool dummy = false)
: mPtr(nullptr)
, mLen(-1)
, mRes(SQ_OK)

10
modules/irc/Common.cpp
View File

@ -33,7 +33,7 @@ void IrcFreeMem(void * p)
static SQInteger SqGetNick(HSQUIRRELVM vm)
{
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -51,7 +51,7 @@ static SQInteger SqGetNick(HSQUIRRELVM vm)
static SQInteger SqGetHost(HSQUIRRELVM vm)
{
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -69,7 +69,7 @@ static SQInteger SqGetHost(HSQUIRRELVM vm)
static SQInteger SqStripColorFromMIRC(HSQUIRRELVM vm)
{
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -94,7 +94,7 @@ static SQInteger SqStripColorFromMIRC(HSQUIRRELVM vm)
static SQInteger SqConvertColorFromMIRC(HSQUIRRELVM vm)
{
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -119,7 +119,7 @@ static SQInteger SqConvertColorFromMIRC(HSQUIRRELVM vm)
static SQInteger SqConvertColorToMIRC(HSQUIRRELVM vm)
{
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{

2
modules/irc/Session.cpp
View File

@ -1048,7 +1048,7 @@ static SQInteger FormattedIrcMessageCmd(HSQUIRRELVM vm, SendIrcMessageFunc send_
}
// Attempt to retrieve the value from the stack as a string
StackStrF message(vm, 3);
StackStrF message(vm, 3, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(message.mRes))
{

6
modules/mysql/Connection.cpp
View File

@ -178,7 +178,7 @@ SQInteger Connection::ExecuteF(HSQUIRRELVM vm)
return sq_throwerror(vm, e.what());
}
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -245,7 +245,7 @@ SQInteger Connection::InsertF(HSQUIRRELVM vm)
return sq_throwerror(vm, e.what());
}
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -318,7 +318,7 @@ SQInteger Connection::QueryF(HSQUIRRELVM vm)
return sq_throwerror(vm, e.what());
}
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{

4
modules/sqlite/Connection.cpp
View File

@ -346,9 +346,9 @@ void Register_Connection(Table & sqlns)
Class< Connection >(sqlns.GetVM(), Typename::Str)
// Constructors
.Ctor()
.Ctor< const StackStrF & >()
.FmtCtor< const StackStrF & >()
.Ctor< const StackStrF &, Int32 >()
.Ctor< const StackStrF &, Int32, const StackStrF & >()
.FmtCtor< const StackStrF &, Int32, const StackStrF & >()
// Meta-methods
.SquirrelFunc(_SC("_typename"), &Typename::Fn)
.Func(_SC("_tostring"), &Connection::ToString)

2
source/CoreFuncs.cpp
View File

@ -25,7 +25,7 @@ static SQInteger SqLoadScript(HSQUIRRELVM vm)
// Whether the script execution is delayed
SQBool delay = SQFalse;
// Attempt to generate the string value
StackStrF val(vm, 3);
StackStrF val(vm, 3, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{

12
source/Entity/Player.cpp
View File

@ -1901,7 +1901,7 @@ SQInteger CPlayer::Msg(HSQUIRRELVM vm)
}
// Attempt to generate the string value
StackStrF val(vm, msgidx);
StackStrF val(vm, msgidx, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -1982,7 +1982,7 @@ SQInteger CPlayer::MsgP(HSQUIRRELVM vm)
}
// Attempt to generate the string value
StackStrF val(vm, 3);
StackStrF val(vm, 3, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -2088,7 +2088,7 @@ SQInteger CPlayer::MsgEx(HSQUIRRELVM vm)
}
// Attempt to generate the string value
StackStrF val(vm, msgidx);
StackStrF val(vm, msgidx, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -2153,7 +2153,7 @@ SQInteger CPlayer::Message(HSQUIRRELVM vm)
}
// Attempt to generate the string value
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -2210,7 +2210,7 @@ SQInteger CPlayer::Announce(HSQUIRRELVM vm)
}
// Attempt to generate the string value
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -2280,7 +2280,7 @@ SQInteger CPlayer::AnnounceEx(HSQUIRRELVM vm)
}
// Attempt to generate the string value
StackStrF val(vm, 3);
StackStrF val(vm, 3, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{

8
source/Library/Crypt/Hash.cpp
View File

@ -36,7 +36,7 @@ template < class T > T BaseHash< T >::Algo;
template < class T > static SQInteger HashF(HSQUIRRELVM vm)
{
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -56,7 +56,7 @@ template < class T > static SQInteger HashF(HSQUIRRELVM vm)
static SQInteger WhirlpoolF(HSQUIRRELVM vm)
{
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -94,7 +94,7 @@ static SQInteger WhirlpoolF(HSQUIRRELVM vm)
static SQInteger EncodeBase64F(HSQUIRRELVM vm)
{
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -122,7 +122,7 @@ static SQInteger EncodeBase64F(HSQUIRRELVM vm)
static SQInteger DecodeBase64F(HSQUIRRELVM vm)
{
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{

4
source/Library/Numeric/Math.cpp
View File

@ -153,7 +153,7 @@ static SQInteger SqNan(HSQUIRRELVM vm)
return sq_throwerror(vm, "Wrong number of arguments");
}
// Attempt to generate the string value
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -178,7 +178,7 @@ static SQInteger SqNanL(HSQUIRRELVM vm)
return sq_throwerror(vm, "Wrong number of arguments");
}
// Attempt to generate the string value
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{

6
source/Library/String.cpp
View File

@ -490,7 +490,7 @@ static SQInteger SplitWhereCharImpl(HSQUIRRELVM vm, int(*fn)(int), bool neg)
}
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -612,7 +612,7 @@ static SQInteger SqStrExplode(HSQUIRRELVM vm)
return sq_throwerror(vm, _SC("Missing string value"));
}
// Attempt to generate the string value
StackStrF val(vm, 4);
StackStrF val(vm, 4, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -812,7 +812,7 @@ static CSStr FromArray(Array & arr)
static SQInteger StdPrintF(HSQUIRRELVM vm)
{
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{

2
source/Library/System.cpp
View File

@ -21,7 +21,7 @@ extern void Register_SysPath(HSQUIRRELVM vm);
static SQInteger SqSysExec(HSQUIRRELVM vm)
{
// Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{

2
source/Library/Utils.cpp
View File

@ -22,7 +22,7 @@ static SQInteger SqExtractIPv4(HSQUIRRELVM vm)
return sq_throwerror(vm, "Missing IP address string");
}
// Attempt to generate the string value
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{

2
source/Logger.cpp
View File

@ -539,7 +539,7 @@ template < Uint8 L, bool S > static SQInteger LogBasicMessage(HSQUIRRELVM vm)
return sq_throwerror(vm, "Missing message value");
}
// Attempt to generate the string value
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{

12
source/Misc/Broadcast.cpp
View File

@ -259,7 +259,7 @@ static SQInteger SqBroadcastMsg(HSQUIRRELVM vm)
}
// Attempt to generate the string value
StackStrF val(vm, msgidx);
StackStrF val(vm, msgidx, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -339,7 +339,7 @@ static SQInteger SqBroadcastMsgP(HSQUIRRELVM vm)
}
// Attempt to generate the string value
StackStrF val(vm, 3);
StackStrF val(vm, 3, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -444,7 +444,7 @@ static SQInteger SqBroadcastMsgEx(HSQUIRRELVM vm)
}
// Attempt to generate the string value
StackStrF val(vm, msgidx);
StackStrF val(vm, msgidx, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -508,7 +508,7 @@ static SQInteger SqBroadcastMessage(HSQUIRRELVM vm)
}
// Attempt to generate the string value
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -564,7 +564,7 @@ static SQInteger SqBroadcastAnnounce(HSQUIRRELVM vm)
}
// Attempt to generate the string value
StackStrF val(vm, 2);
StackStrF val(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{
@ -641,7 +641,7 @@ static SQInteger SqBroadcastAnnounceEx(HSQUIRRELVM vm)
}
// Attempt to generate the string value
StackStrF val(vm, 3);
StackStrF val(vm, 3, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(val.mRes))
{

2
source/Tasks.hpp
View File

@ -499,7 +499,7 @@ public:
return sq_throwerror(vm, e.what());
}
// Attempt to generate the string value
const StackStrF tag(vm, 2);
const StackStrF tag(vm, 2, true);
// Have we failed to retrieve the string?
if (SQ_FAILED(tag.mRes))
{