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

Tracing: Fix past-end handling in TraceStashFile::Iterator

Browse Source 
If we read past the end of the stream in open() or next() we don't want
to process the resulting event. This fixes the QmlProfilerTraceClient
test.

Change-Id: Iaaa60f462aa588096001579efae7ed1a88d6d6a3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Ulf Hermann
2018-05-22 14:39:11 +02:00
parent c0b8ac7966
commit dd9c7de89a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/tracing/tracestashfile.h
View File

@@ -75,10 +75,13 @@ public:
{ {
if (readFile->open(QIODevice::ReadOnly)) { if (readFile->open(QIODevice::ReadOnly)) {
readStream->setDevice(readFile.get()); readStream->setDevice(readFile.get());
if (readStream->atEnd()) if (readStream->atEnd()) {
streamAtEnd = true; streamAtEnd = true;
else } else {
(*readStream) >> nextEvent; (*readStream) >> nextEvent;
if (readPastEnd())
streamAtEnd = true;
}
return true; return true;
} }
streamAtEnd = true; streamAtEnd = true;
@@ -107,6 +110,8 @@ public:
const Event result = std::move(nextEvent); const Event result = std::move(nextEvent);
(*readStream) >> nextEvent; (*readStream) >> nextEvent;
if (readPastEnd())
streamAtEnd = true;
return result; return result;
} }