summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-05-03 14:56:05 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-05-18 10:46:43 +1000
commitc0372871f8f8493ac1b59b800caed4b55d1c9b6f (patch)
tree14aff4634b72806e4ea422b9bfac52f1b0e6f3a0
parentd7e10b2a71f1fa196472544309dc59488229ebeb (diff)
Remove Q_ASSERT from qtesselator autotest
If the test data is incorrect, print a meaningful warning into the test output instead of deferencing an iterator beyond the last element in the list. Change-Id: I7be4f282639453de6d8240a2f17253025b415337 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit f01e2a5024db69913aed016e2854b2589ca85080)
-rw-r--r--tests/auto/qtessellator/dataparser.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/qtessellator/dataparser.cpp b/tests/auto/qtessellator/dataparser.cpp
index bd17ee2835..d6566cb2f9 100644
--- a/tests/auto/qtessellator/dataparser.cpp
+++ b/tests/auto/qtessellator/dataparser.cpp
@@ -98,8 +98,12 @@ static QList<QPointF> parsePoints(const QByteArray &line)
QList<qreal> nums = parseNumbersList(it);
QList<qreal>::const_iterator nitr;
for (nitr = nums.begin(); nitr != nums.end(); ++nitr) {
- qreal x = *nitr; ++nitr;
- Q_ASSERT(nitr != nums.end());
+ qreal x = *nitr;
+ ++nitr;
+ if (nitr == nums.end()) {
+ qWarning() << "parsePoints: Even number of co-ordinates required, odd number found: skipping last point";
+ break;
+ }
qreal y = *nitr;
res.append(QPointF(x, y));
}