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

Downgrade assert to verify, in case the format string came from an external data source.

Browse Source 
Part 2 of hotfix for assert caused by percent character in vatsim-data.txt
This commit is contained in:
Mat Sutcliffe
2019-08-31 14:11:24 +01:00
parent 82ce1c7fbc
commit fd6bb52f9c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackmisc/statusmessage.cpp
View File

@@ -14,6 +14,7 @@
#include "logmessage.h" #include "logmessage.h"
#include "comparefunctions.h" #include "comparefunctions.h"
#include "stringutils.h" #include "stringutils.h"
#include "verify.h"
#include <QMetaEnum> #include <QMetaEnum>
#include <QStringBuilder> #include <QStringBuilder>
@@ -47,10 +48,10 @@ namespace BlackMisc
if (is09(*it)) if (is09(*it))
{ {
int n = it->unicode() - u'0'; int n = it->unicode() - u'0';
Q_ASSERT(n >= 0 && n <= 9); BLACK_VERIFY(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); BLACK_VERIFY(n >= 0 && n <= 99);
if (n <= args.size()) { temp += args[n - 1]; unusedArgs &= ~(1ULL << (n - 1)); } if (n > 0 && n <= args.size()) { temp += args[n - 1]; unusedArgs &= ~(1ULL << (n - 1)); }
else { temp += u'%' % QString::number(n); } else { temp += u'%' % QString::number(n); }
} }
else { temp += u'%'; } else { temp += u'%'; }