flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-16 18:35:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T585 Check for missing %n placeholders in log message format strings.

Browse Source
This commit is contained in:
Mat Sutcliffe
2019-04-06 18:03:21 +01:00
parent 6e01e63a89
commit a78f455c18
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackmisc/statusmessage.cpp
View File

@@ -35,6 +35,7 @@ namespace BlackMisc
QString &temp = t_tempBuffer.localData(); QString &temp = t_tempBuffer.localData();
temp.resize(0); // unlike clear(), resize(0) doesn't release the capacity if there are no implicitly shared copies temp.resize(0); // unlike clear(), resize(0) doesn't release the capacity if there are no implicitly shared copies
quint64 unusedArgs = (1ULL << std::min(63, args.size())) - 1;
for (auto it = format.begin(); ; ) for (auto it = format.begin(); ; )
{ {
const auto pc = std::find(it, format.end(), u'%'); const auto pc = std::find(it, format.end(), u'%');
@@ -49,10 +50,13 @@ namespace BlackMisc
Q_ASSERT(n >= 0 && n <= 9); Q_ASSERT(n >= 0 && n <= 9);
if (++it != format.end() && is09(*it)) { n = n * 10 + it->unicode() - u'0'; ++it; } if (++it != format.end() && is09(*it)) { n = n * 10 + it->unicode() - u'0'; ++it; }
Q_ASSERT(n >= 0 && n <= 99); Q_ASSERT(n >= 0 && n <= 99);
if (n <= args.size()) { temp += args[n - 1]; } else { temp += u'%' % QString::number(n); } if (n <= args.size()) { temp += args[n - 1]; unusedArgs &= ~(1ULL << (n - 1)); }
else { temp += u'%' % QString::number(n); }
} }
else { temp += u'%'; } else { temp += u'%'; }
} }
if (unusedArgs) { temp += QStringLiteral(" [SOME MESSAGE ARGUMENT(S) UNUSED]"); }
QString result = temp; QString result = temp;
result.squeeze(); // release unused capacity and implicitly detach so temp keeps its capacity for next time result.squeeze(); // release unused capacity and implicitly detach so temp keeps its capacity for next time
return result; return result;