diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2017-09-08 14:32:06 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-09-12 14:25:23 +0000 |
commit | 0f21decf41e052855570d1c7400428911426eec7 (patch) | |
tree | 2c3cab8fd969a9491b66523af3b077ac1f60b60d /src/plugins/qmlprofiler/qmlprofilertracefile.cpp | |
parent | 9cdb0ec22ec47dac7a0e440bd93ab7d3d0cb6a9f (diff) |
QmlProfiler: Correctly handle invalid message types
We might get malformed events from the application. Clamp message and
range types into the allowed enum values when reading and reset the
event data when reading an invalid event.
Change-Id: Id76a3a8b8ed9378f9fb1acf15cf46d20758ca030
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilertracefile.cpp')
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofilertracefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilertracefile.cpp b/src/plugins/qmlprofiler/qmlprofilertracefile.cpp index 710461b656..87f6e89e44 100644 --- a/src/plugins/qmlprofiler/qmlprofilertracefile.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertracefile.cpp @@ -108,7 +108,7 @@ static QString qmlTypeAsString(Message message, RangeType rangeType) { if (rangeType < MaximumRangeType) return _(RANGE_TYPE_STRINGS[rangeType]); - else if (message != MaximumMessage) + else if (message < MaximumMessage) return _(MESSAGE_STRINGS[message]); else return QString::number((int)rangeType); |