diff options
| author | Nobuaki Sukegawa <nsukeg@gmail.com> | 2014-12-15 02:33:05 +0900 |
|---|---|---|
| committer | Nobuaki Sukegawa <nsukeg@gmail.com> | 2015-01-02 15:31:11 +0100 |
| commit | 96178192c451a5e26e30e14a619b96aacd16c29b (patch) | |
| tree | 3a916cd5f3efcd09e68f65f948dcc61e493c547b /src/qml/jsruntime/qv4script.cpp | |
| parent | 2b5fb185627f8adfb6c5b3d62990a58429bf4ea7 (diff) | |
Do not cause SegFault when importing empty javascript
Change-Id: I31f6571e73b5dd74bf3ade5cadc2daa02475b5cb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4script.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index 38d2c12cfb..d4eb388d6e 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -199,14 +199,12 @@ Script::Script(ExecutionEngine *v4, Object *qml, CompiledData::CompilationUnit * { parsed = true; - if (compilationUnit) { - vmFunction = compilationUnit->linkToEngine(v4); - Q_ASSERT(vmFunction); + vmFunction = compilationUnit ? compilationUnit->linkToEngine(v4) : 0; + if (vmFunction) { Scope valueScope(v4); ScopedObject holder(valueScope, v4->memoryManager->alloc<CompilationUnitHolder>(v4, compilationUnit)); compilationUnitHolder = holder.asReturnedValue(); - } else - vmFunction = 0; + } } Script::~Script() |