From: Lars Knoll <lars.knoll@digia.com>
Date: Fri, 28 Jun 2013 11:24:44 +0000 (+0200)
Subject: Fix IdentifierHash::findId()
X-Git-Tag: upstream/5.2.1~669^2~96
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e0b511204f54a6a94878bb6d620d116d3117423b;p=platform%2Fupstream%2Fqtdeclarative.git

Fix IdentifierHash::findId()

Change-Id: Ie5e18b82ceeef85a4dc3e36345c5824f907bb122
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---

diff --git a/src/qml/qml/v4/qv4identifier_p.h b/src/qml/qml/v4/qv4identifier_p.h
index 250f4be..7c69e1d 100644
--- a/src/qml/qml/v4/qv4identifier_p.h
+++ b/src/qml/qml/v4/qv4identifier_p.h
@@ -205,8 +205,9 @@ QString IdentifierHash<T>::findId(T value) const
     IdentifierHashEntry *e = d->entries;
     IdentifierHashEntry *end = e + d->alloc;
     while (e < end) {
-        if (e->get((T*)0) == value)
+        if (e->identifier && e->get((T*)0) == value)
             return e->identifier->string;
+        ++e;
     }
     return QString();
 }