summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-02-26 13:27:37 +0100
committerJohan Helsing <johan.helsing@qt.io>2018-03-08 10:34:58 +0000
commit1370438ac99b64012517d1110fa8a2cd71dd4423 (patch)
treecc2c01e5e19cb01bd93e157dec6c550f039c92b0
parentbdac13745f2f2613aca133aa590ae2da1b67e6ad (diff)
Fix nullptr dereference in client tests
Change-Id: I932cd20f17b5486a1161569c5e9a3feebabeee8e Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
-rw-r--r--tests/auto/client/shared/mockcompositor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/client/shared/mockcompositor.cpp b/tests/auto/client/shared/mockcompositor.cpp
index 1d76cec12..ef2636b0f 100644
--- a/tests/auto/client/shared/mockcompositor.cpp
+++ b/tests/auto/client/shared/mockcompositor.cpp
@@ -245,7 +245,8 @@ QSharedPointer<MockOutput> MockCompositor::output(int index)
{
QSharedPointer<MockOutput> result;
lock();
- result = m_compositor->outputs().at(index)->mockOutput();
+ if (Impl::Output *output = m_compositor->outputs().value(index, nullptr))
+ result = output->mockOutput();
unlock();
return result;
}