From e2fb12650924c99cf81b4930fd38058102bf1c8b Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 29 Nov 2016 14:25:20 +0100 Subject: [PATCH] Scxml: Avoid possible nullptr dereference Change-Id: Ie70da61f1c4f05d9247eb8b729fadad59b85cc45 Reviewed-by: Ulf Hermann --- .../scxmleditor/plugin_interface/transitionitem.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp b/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp index 47179aab879..154324fd98d 100644 --- a/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp @@ -621,10 +621,8 @@ void TransitionItem::connectToTopItem(const QPointF &pos, TransitionPoint tp, It } } - if (!parentTag) { - if (document) - parentTag = document->rootTag(); - } + if (!parentTag && document) + parentTag = document->rootTag(); // Connect existing item if (targetType == UnknownType) { @@ -675,7 +673,8 @@ void TransitionItem::connectToTopItem(const QPointF &pos, TransitionPoint tp, It if (parentItem) parentItem->updateUIProperties(); - document->addTag(parentTag, newTag); + if (document) + document->addTag(parentTag, newTag); setEndItem(newItem); setSelected(false);