summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2017-09-13 14:02:16 +0200
committerNikolai Kosjar <nikolai.kosjar@qt.io>2017-09-13 12:09:46 +0000
commitad560bf01902d50fc44e02037709e34aea9bc220 (patch)
treee7ebad056e45b0e2e72b7f2310d66720f8142347
parentf439183c8db9680e082316b56b43a46863d1c3a5 (diff)
downloadqt-creator-ad560bf01902d50fc44e02037709e34aea9bc220.tar.gz
CPlusPlus: Avoid nullptr access
Task-number: QTCREATORBUG-18903 Change-Id: I852b5de453d44c16adffd44c89900cfb8c3cc522 Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
-rw-r--r--src/libs/3rdparty/cplusplus/Symbols.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libs/3rdparty/cplusplus/Symbols.cpp b/src/libs/3rdparty/cplusplus/Symbols.cpp
index f7423e7742..fe0148b23b 100644
--- a/src/libs/3rdparty/cplusplus/Symbols.cpp
+++ b/src/libs/3rdparty/cplusplus/Symbols.cpp
@@ -106,7 +106,11 @@ Declaration::Declaration(Clone *clone, Subst *subst, Declaration *original)
, _initializer(clone->stringLiteral(original->_initializer))
{
const char* nameId = nullptr;
- if (const Identifier* identifier = name()->identifier())
+ const Name *theName = name();
+ if (!theName)
+ return;
+
+ if (const Identifier* identifier = theName->identifier())
nameId = identifier->chars();
else
return;