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

QmlProfiler: assert that connections are AnalyzerConnections

Browse Source 
... before accessing them as AnalyzerConnection

Change-Id: I6f6111ca3b0dede93ac85fbcb5ffbfcf3c7b19aa
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-06-02 16:19:41 +02:00
parent 7d5d026244
commit 7ecd0763b9
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
View File

@@ -251,8 +251,10 @@ void QmlProfilerRunControl::processIsRunning(Utils::Port port)
{ {
d->m_noDebugOutputTimer.stop(); d->m_noDebugOutputTimer.stop();
if (!port.isValid()) if (!port.isValid()) {
QTC_ASSERT(connection().is<AnalyzerConnection>(), return);
port = connection().as<AnalyzerConnection>().analyzerPort; port = connection().as<AnalyzerConnection>().analyzerPort;
}
if (port.isValid()) if (port.isValid())
emit processRunning(port); emit processRunning(port);
} }

1
src/plugins/qmlprofiler/qmlprofilertool.cpp
View File

@@ -349,6 +349,7 @@ void QmlProfilerTool::finalizeRunControl(QmlProfilerRunControl *runControl)
{ {
runControl->registerProfilerStateManager(d->m_profilerState); runControl->registerProfilerStateManager(d->m_profilerState);
QTC_ASSERT(runControl->connection().is<AnalyzerConnection>(), return);
// FIXME: Check that there's something sensible in sp.connParams // FIXME: Check that there's something sensible in sp.connParams
auto connection = runControl->connection().as<AnalyzerConnection>(); auto connection = runControl->connection().as<AnalyzerConnection>();
if (!connection.analyzerSocket.isEmpty()) if (!connection.analyzerSocket.isEmpty())