From 3e3bf7e37298841351648970c3cfee770547d7e3 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Mon, 27 Sep 2010 17:52:40 +0200
Subject: [PATCH] C++: fixed possible null-pointer access.

Task-number: QTCREATORBUG-2459
(cherry picked from commit d09b5e9d365e3ce54078fb172c93b9584908bcad)
---
 src/shared/cplusplus/Scope.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/shared/cplusplus/Scope.cpp b/src/shared/cplusplus/Scope.cpp
index 87655be6c34..ee5253b7dd8 100644
--- a/src/shared/cplusplus/Scope.cpp
+++ b/src/shared/cplusplus/Scope.cpp
@@ -194,10 +194,11 @@ Symbol *SymbolTable::lookat(OperatorNameId::Kind operatorId) const
     const unsigned h = operatorId % _hashSize;
     Symbol *symbol = _hash[h];
     for (; symbol; symbol = symbol->_next) {
-        const Name *identity = symbol->unqualifiedName();
-        if (const OperatorNameId *op = identity->asOperatorNameId()) {
-            if (op->kind() == operatorId)
-                break;
+        if (const Name *identity = symbol->unqualifiedName()) {
+            if (const OperatorNameId *op = identity->asOperatorNameId()) {
+                if (op->kind() == operatorId)
+                    break;
+            }
         }
     }
     return symbol;