diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-11-29 08:44:14 +0100 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-11-29 09:57:59 +0100 |
| commit | 25842cb13a18ec946fe80b6d869f2b00dbd2ce9c (patch) | |
| tree | 0acd72149d3f77f664fd641a25c53192250986e2 /src/libs/qmljs | |
| parent | a7e4f3ce04c91555c8221961a2b6c7f6f0fb3038 (diff) | |
| download | qt-creator-25842cb13a18ec946fe80b6d869f2b00dbd2ce9c.tar.gz | |
QmlJS: Add protection against attached types attaching to themselves.
Change-Id: Ib81d5e6baabf5ac8d18411e8936098908de2c2bb
Task-number: QTCREATORBUG-6635
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Diffstat (limited to 'src/libs/qmljs')
| -rw-r--r-- | src/libs/qmljs/qmljsinterpreter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp index 746bbb0f01..c926fbd90a 100644 --- a/src/libs/qmljs/qmljsinterpreter.cpp +++ b/src/libs/qmljs/qmljsinterpreter.cpp @@ -285,7 +285,7 @@ void CppComponentValue::processMembers(MemberProcessor *processor) const const QString &attachedTypeName = _metaObject->attachedTypeName(); if (!attachedTypeName.isEmpty()) { const CppComponentValue *attachedType = valueOwner()->cppQmlTypes().objectByCppName(attachedTypeName); - if (attachedType) + if (attachedType && attachedType != this) // ### only weak protection against infinite loops attachedType->processMembers(processor); } |