From 6989f69b641b1d0da1be7d25efa1faa22a5b7fe9 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 15 Sep 2017 10:49:01 +0200
Subject: [PATCH] Guard for null pointer access

---
 .../cafPdmUiTreeSelectionQModel.cpp             | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp
index 95873faace..922aae0c97 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp
@@ -202,15 +202,18 @@ QVariant caf::PdmUiTreeSelectionQModel::data(const QModelIndex &index, int role
         {
             CAF_ASSERT(m_uiFieldHandle);
 
-            QVariant fieldValue = m_uiFieldHandle->field()->uiValue();
-            QList<QVariant> valuesSelectedInField = fieldValue.toList();
-
-            for (QVariant v : valuesSelectedInField)
+            if (m_uiFieldHandle && m_uiFieldHandle->field())
             {
-                int indexInField = v.toInt();
-                if (indexInField == opIndex)
+                QVariant fieldValue = m_uiFieldHandle->field()->uiValue();
+                QList<QVariant> valuesSelectedInField = fieldValue.toList();
+
+                for (QVariant v : valuesSelectedInField)
                 {
-                    return Qt::Checked;
+                    int indexInField = v.toInt();
+                    if (indexInField == opIndex)
+                    {
+                        return Qt::Checked;
+                    }
                 }
             }