From 82c963d3a2c6098dedb2bcfc5a974d65205e5418 Mon Sep 17 00:00:00 2001
From: orbitcowboy <orbitcowboy@web.de>
Date: Fri, 2 Feb 2018 08:45:13 +0100
Subject: [PATCH] symboldatabase: Fix null pointer dereference, introduced by
 https://github.com/danmar/cppcheck/commit/ee1ba85e1548bbf625aa807651944d548042de64#comments.

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

diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 7061b1b02..3153f830d 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -130,8 +130,9 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                     // goto initial '{'
                     if (!new_scope->definedType) {
                         _tokenizer->syntaxError(nullptr); // #6808
-                        tok2 = new_scope->definedType->initBaseInfo(tok, tok2);
+                        break;
                     }
+                    tok2 = new_scope->definedType->initBaseInfo(tok, tok2);
                     // make sure we have valid code
                     if (!tok2) {
                         break;