diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2010-09-24 09:49:35 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2010-09-24 13:28:01 +0200 |
| commit | 13faf49322232a8339cf60846fddfd2e78452cb1 (patch) | |
| tree | a3d3c7ad0e5aac2d07c889b4a6de08414166ba7f | |
| parent | 74cf70deafab891ff79c45b3199708457e892f33 (diff) | |
| download | qt-creator-13faf49322232a8339cf60846fddfd2e78452cb1.tar.gz | |
QmlJS: Fix segfault during import resolution.
| -rw-r--r-- | src/libs/qmljs/qmljslink.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index a8a971308d..9539cfc581 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -301,7 +301,8 @@ ObjectValue *Link::importFile(Document::Ptr, const ImportInfo &importInfo) } } else if (importInfo.type() == ImportInfo::FileImport) { Document::Ptr importedDoc = d->snapshot.document(path); - import = importedDoc->bind()->rootObjectValue(); + if (importedDoc) + import = importedDoc->bind()->rootObjectValue(); } return import; |