From d2f6c31cd49f414b05565c82b26da5f755dfff84 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 27 Aug 2014 14:10:05 +0200 Subject: [PATCH] QmlProfiler: Fix invalid list access when nesting timeline events We should check if the parent list is empty before accessing it, not after. Change-Id: Ia61887414b526b4414aa8a45d0c8779e020529e4 Reviewed-by: Kai Koehne --- src/plugins/qmlprofiler/sortedtimelinemodel.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmlprofiler/sortedtimelinemodel.cpp b/src/plugins/qmlprofiler/sortedtimelinemodel.cpp index 3ee4e27d045..27383b25ac4 100644 --- a/src/plugins/qmlprofiler/sortedtimelinemodel.cpp +++ b/src/plugins/qmlprofiler/sortedtimelinemodel.cpp @@ -127,6 +127,11 @@ void SortedTimelineModel::computeNesting() for (int range = 0; range != count(); ++range) { Range ¤t = ranges[range]; for (QLinkedList::iterator parentIt = parents.begin();;) { + if (parentIt == parents.end()) { + parents.append(range); + break; + } + Range &parent = ranges[*parentIt]; qint64 parentEnd = parent.start + parent.duration; if (parentEnd < current.start) { @@ -152,11 +157,6 @@ void SortedTimelineModel::computeNesting() } else { ++parentIt; } - - if (parentIt == parents.end()) { - parents.append(range); - break; - } } } }