From 819d0886b1951dc89524fee391ac6ddfbbf435e5 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Wed, 18 Feb 2009 15:55:21 +0100
Subject: [PATCH] Fixes: Possible crash while resolving qualified name ids.
There is no need to "expand" again the scope we get from invoking `resolve'.
(cherry picked from commit c72c84d8375692b1cf1ad5c9ba3594f3727f9c02)
---
src/libs/cplusplus/LookupContext.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index 01d4e13b4eb..491a9914ab9 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -176,7 +176,7 @@ QList<Symbol *> LookupContext::resolve(Name *name, const QList<Scope *> &visible
scopes.clear();
foreach (Symbol *candidate, candidates) {
if (ScopedSymbol *scoped = candidate->asScopedSymbol()) {
- expand(scoped->members(), visibleScopes, &scopes);
+ scopes.append(scoped->members());
}
}
}
--
GitLab