diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-10-17 15:14:59 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-10-23 06:27:33 +0000 |
| commit | bc2427ce32efbfa3759e2658ba53289428527071 (patch) | |
| tree | d4b454d585c1f66cb87cec8b3449a084a7c692b2 /src/qml/memory | |
| parent | aceb0d0cd2da89aebbf17729869b9e977290c826 (diff) | |
Never truncate the JS stack
Truncating it can lead to all sorts of crazy side effects, especially
as we'd be extending it again when leaving the function. When that happens
already freed JS objects could suddenly become visible to the GC again.
Fix this by copying the CallData to set up a new stack frame. This is not yet
ideal, as we're copying too much data, but that can be fixed separately.
Change-Id: I02a39ce479475bae326f9eddfe6654fbcf8e6d35
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/memory')
| -rw-r--r-- | src/qml/memory/qv4mm.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp index b9bc2c34a3..21c95bbe6e 100644 --- a/src/qml/memory/qv4mm.cpp +++ b/src/qml/memory/qv4mm.cpp @@ -1256,9 +1256,11 @@ void MemoryManager::collectFromJSStack(MarkStack *markStack) const Value *top = engine->jsStackTop; while (v < top) { Managed *m = v->managed(); - if (m && m->inUse()) + if (m) { + Q_ASSERT(m->inUse()); // Skip pointers to already freed objects, they are bogus as well m->mark(markStack); + } ++v; } } |