thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-07-01 06:27:11 +02:00
Code Releases Activity

Allow null parameters in StackStrF.

Browse Source
This commit is contained in:
Sandu Liviu Catalin
2018-07-30 20:40:52 +03:00
parent 4e31fc478c
commit ecca09d6ce
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/sqrat/sqratUtil.h
View File

@ -1593,7 +1593,7 @@ struct StackStrF
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
StackStrF(HSQUIRRELVM vm, SQInteger idx)
: mPtr(nullptr)
, mLen(-1)
, mLen(SQ_ERROR)
, mRes(SQ_OK)
, mObj()
, mVM(vm)
@ -1659,6 +1659,7 @@ struct StackStrF
// Since this is a dummy then avoid making it look like a failure
mPtr = _SC("");
mLen = 0;
mRes = SQ_OK;
// We're not supposed to proceed with this!
return mRes;
}
@ -1669,6 +1670,14 @@ struct StackStrF
{
mRes = sq_throwerror(mVM, "Missing string or value");
}
// If null was specified then treat it as a dummy
else if (sq_gettype(mVM, mIdx) == OT_NULL)
{
// Default to an empty string and ignore formatting even if possible
mPtr = _SC("");
mLen = 0;
mRes = SQ_OK;
}
// Do we have enough values to call the format function and are we allowed to?
else if (fmt && (top - 1) >= mIdx)
{