diff options
author | Eike Ziller <eike.ziller@qt.io> | 2017-09-19 12:00:16 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2017-09-19 12:10:26 +0200 |
commit | 3d9cf954e22636667a058ce96015d51ac6044d2c (patch) | |
tree | 3d906d5609537c489a44dd93ba8533d4615fd171 /src/libs/3rdparty/cplusplus/Symbols.cpp | |
parent | fe1cbd0f877ee8c055911b7e8bdf8f7c6cd131d8 (diff) | |
parent | b58dadfecc36255c0e64e0cc02e162e1595953b5 (diff) |
Merge remote-tracking branch 'origin/4.4'
Conflicts:
src/plugins/debugger/debuggerdialogs.cpp
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
Change-Id: I1ae77869887a8d9ef2a33439f2733315db9e0cf0
Diffstat (limited to 'src/libs/3rdparty/cplusplus/Symbols.cpp')
-rw-r--r-- | src/libs/3rdparty/cplusplus/Symbols.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libs/3rdparty/cplusplus/Symbols.cpp b/src/libs/3rdparty/cplusplus/Symbols.cpp index 9a84ccacd6..4952469fba 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; |