feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProfiler: Fix invalid list access when nesting timeline events

Browse Source 
We should check if the parent list is empty before accessing it, not
after.

Change-Id: Ia61887414b526b4414aa8a45d0c8779e020529e4
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Ulf Hermann
2014-08-27 14:10:05 +02:00
parent 8d74fdd6d4
commit d2f6c31cd4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmlprofiler/sortedtimelinemodel.cpp
View File

@@ -127,6 +127,11 @@ void SortedTimelineModel::computeNesting()
for (int range = 0; range != count(); ++range) { for (int range = 0; range != count(); ++range) {
Range &current = ranges[range]; Range &current = ranges[range];
for (QLinkedList<int>::iterator parentIt = parents.begin();;) { for (QLinkedList<int>::iterator parentIt = parents.begin();;) {
if (parentIt == parents.end()) {
parents.append(range);
break;
}
Range &parent = ranges[*parentIt]; Range &parent = ranges[*parentIt];
qint64 parentEnd = parent.start + parent.duration; qint64 parentEnd = parent.start + parent.duration;
if (parentEnd < current.start) { if (parentEnd < current.start) {
@@ -152,11 +157,6 @@ void SortedTimelineModel::computeNesting()
} else { } else {
++parentIt; ++parentIt;
} }
if (parentIt == parents.end()) {
parents.append(range);
break;
}
} }
} }
} }