russell@unturf.com
6f11fb7598
Scanned xTuple OpenRPT (public C++/Qt report engine used by xTuple ERP). One MOAD-0001 defect found in orutils.cpp SQL parameter parsing loop. MOADs 0002/0003/0004/0005 CLEAN.
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
--- a/OpenRPT/renderer/orutils.cpp
|
|
+++ b/OpenRPT/renderer/orutils.cpp
|
|
@@ -21,6 +21,7 @@
|
|
#include "orutils.h"
|
|
#include <QRegExp>
|
|
+#include <QSet>
|
|
|
|
#include "../../MetaSQL/metasql.h"
|
|
|
|
@@ -50,6 +51,9 @@ orQuery::orQuery( const QString &qstrPName, const QString &qstrSQL,
|
|
if(rexp.indexIn(qstrParsedSQL) == -1)
|
|
{
|
|
// Parse through the passed SQL populating the parameters
|
|
+ // Use a QSet shadow for O(1) membership test so we do not scan the
|
|
+ // growing missingParamList (QStringList::contains is O(M)) on every iteration.
|
|
+ QSet<QString> missingParamSet;
|
|
QRegExp re("(?:%(\\d+))|(?:\\$\"([^\"]*)\")");
|
|
while ((intStartIndex = re.indexIn(qstrParsedSQL,intStartIndex)) != -1)
|
|
{
|
|
@@ -60,8 +64,11 @@ orQuery::orQuery( const QString &qstrPName, const QString &qstrSQL,
|
|
val = qstrlstParams.value(n).toString();
|
|
if(val.isNull())
|
|
{
|
|
- // add this to the list of missing parameters
|
|
- if(!missingParamList.contains(n))
|
|
+ // add this to the list of missing parameters (dedup via hash set)
|
|
+ if(!missingParamSet.contains(n))
|
|
+ {
|
|
+ missingParamSet.insert(n);
|
|
missingParamList.append(n);
|
|
+ }
|
|
}
|
|
}
|
|
else if(match[0] == '%')
|
|
@@ -74,8 +81,12 @@ orQuery::orQuery( const QString &qstrPName, const QString &qstrSQL,
|
|
else
|
|
{
|
|
// add this to the list of missing parameters
|
|
+ // dedup via hash set to avoid O(P*M) QStringList scan
|
|
QString s = QString("%%1").arg(intParamNum);
|
|
- if(!missingParamList.contains(s)) missingParamList.append(s);
|
|
+ if(!missingParamSet.contains(s)) {
|
|
+ missingParamSet.insert(s);
|
|
+ missingParamList.append(s);
|
|
+ }
|
|
}
|
|
}
|
|
else
|