From 862c4ef87b109ae86c2d5f12769b7c8d199f35c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Mon, 8 Jul 2019 17:43:45 +0200
Subject: [PATCH] Symboldatabase: Fix possible null pointer dereference if
 smart pointer type does not have a scope

---
 lib/symboldatabase.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 8fc56faf0..af0a0822f 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -4455,10 +4455,10 @@ const Function* SymbolDatabase::findFunction(const Token *tok) const
         const Token *tok1 = tok->tokAt(-2);
         if (Token::Match(tok1, "%var% .")) {
             const Variable *var = getVariableFromVarId(tok1->varId());
-            if (var && var->smartPointerType() && tok1->next()->originalName() == "->")
-                return var->smartPointerType()->classScope->findFunction(tok, var->valueType()->constness == 1);
             if (var && var->typeScope())
                 return var->typeScope()->findFunction(tok, var->valueType()->constness == 1);
+            if (var && var->smartPointerType() && var->smartPointerType()->classScope && tok1->next()->originalName() == "->")
+                return var->smartPointerType()->classScope->findFunction(tok, var->valueType()->constness == 1);
         } else if (Token::simpleMatch(tok->previous()->astOperand1(), "(")) {
             const Token *castTok = tok->previous()->astOperand1();
             if (castTok->isCast()) {