From 13faf49322232a8339cf60846fddfd2e78452cb1 Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Fri, 24 Sep 2010 09:49:35 +0200
Subject: [PATCH] QmlJS: Fix segfault during import resolution.
---
src/libs/qmljs/qmljslink.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp
index a8a971308dd..9539cfc581c 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;
--
GitLab