From cea32d6467b47371524a1e10fa1ad526349a646e Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Thu, 26 Aug 2010 11:32:04 +0200
Subject: [PATCH] QmlJS: Fix possible segfaults with null documents.
---
src/libs/qmljs/qmljsinterpreter.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index e47e4c1fadb..9bd5d7dcca9 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -1448,11 +1448,15 @@ ScopeChain &Context::scopeChain()
const ObjectValue *Context::typeEnvironment(const QmlJS::Document *doc) const
{
+ if (!doc)
+ return 0;
return _typeEnvironments.value(doc->fileName(), 0);
}
void Context::setTypeEnvironment(const QmlJS::Document *doc, const ObjectValue *typeEnvironment)
{
+ if (!doc)
+ return;
_typeEnvironments[doc->fileName()] = typeEnvironment;
}
--
GitLab