fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

mf_string_format: fix inconsistent behavior of escaped percent character

Browse Source
This commit is contained in:
phobos2077
2024-07-06 15:24:54 +02:00
parent dc3537747f
commit 2daf5b8190
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Modules/Scripting/Handlers/Utils.cpp
+19 -15
View File
@@ -248,10 +248,14 @@ static const char* sprintf_lite(OpcodeContext& ctx, const char* opcodeName) {
if (!conversion) {
// Start conversion.
if (c == '%') conversion = true;
} else {
} else if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '%') {
int partLen;
if (c == '%') {
conversion = false; // escaped % sign, just skip
} else if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
// escaped % sign, just copy newFmt up to (and including) the leading % sign
newFmt[j] = '\0';
strncpy_s(outBuf, bufCount, newFmt, j);
partLen = j;
} else {
// ignore size prefixes
if (c == 'h' || c == 'l' || c == 'j' || c == 'z' || c == 't' || c == 'w' || c == 'L' || c == 'I') continue;
// Type specifier, perform conversion.
@@ -263,24 +267,24 @@ static const char* sprintf_lite(OpcodeContext& ctx, const char* opcodeName) {
c = 's'; // don't allow wide strings
}
if (c == 's' && !arg.isString() || // don't allow treating non-string values as string pointers
c == 'n') // don't allow "n" specifier
c == 'n') // don't allow "n" specifier
{
c = 'd';
}
newFmt[j++] = c;
newFmt[j] = '\0';
int partLen = arg.isFloat()
? _snprintf(outBuf, bufCount, newFmt, arg.floatValue())
: _snprintf(outBuf, bufCount, newFmt, arg.rawValue());
outBuf += partLen;
bufCount -= partLen;
conversion = false;
j = 0;
if (bufCount <= 0) {
break;
}
continue;
partLen = arg.isFloat()
? _snprintf(outBuf, bufCount, newFmt, arg.floatValue())
: _snprintf(outBuf, bufCount, newFmt, arg.rawValue());
}
outBuf += partLen;
bufCount -= partLen;
conversion = false;
j = 0;
if (bufCount <= 0) {
break;
}
continue;
}
newFmt[j++] = c;
}