feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Fix crash when reading malformed qmltypes files.

Browse Source 
Task-number: QTCREATORBUG-6587
Change-Id: I0b7c65c1d7f613283e447293daf26673e88ba6e7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Christian Kamm
2011-11-21 09:32:32 +01:00
committed by Eike Ziller
parent 5895598005
commit 2e724095c1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/qmljs/qmljstypedescriptionreader.cpp
View File

@@ -145,7 +145,11 @@ void TypeDescriptionReader::readModule(UiObjectDefinition *ast)
for (UiObjectMemberList *it = ast->initializer->members; it; it = it->next) {
UiObjectMember *member = it->member;
UiObjectDefinition *component = dynamic_cast<UiObjectDefinition *>(member);
const QString typeName = Bind::toString(component->qualifiedTypeNameId);
QString typeName;
if (component)
typeName = Bind::toString(component->qualifiedTypeNameId);
if (!component || (typeName != "Component" && typeName != "ModuleApi")) {
addWarning(member->firstSourceLocation(), "Expected only 'Component' and 'ModuleApi' object definitions");
continue;