Fix interpreter exception handling.

The stack frame of the interpreting function is restored, but all the
datastructures live on the heap. So, save them out on handler creation,
and restore them afterwards.

Change-Id: I84b84007cc9944b56926bf0387c2798f7841cd2a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 12 insertions, 1 deletions

diff --git a/qmljs_objects.h b/qmljs_objects.h
index 857b12bcd9..f40eab0802 100644
--- a/qmljs_objects.h
+++ b/qmljs_objects.h
@@ -582,13 +582,24 @@ struct ExecutionEngine
     String *id___proto__;
 
     struct ExceptionHandler {
+        struct InterpreterState {
+            QVector<VM::Value> stack;
+            int targetTempIndex;
+            const uchar *code;
+        };
+
         Context *context;
         jmp_buf stackFrame;
+        InterpreterState *interpreterState;
+
+        ExceptionHandler(): interpreterState(0) {}
+        ~ExceptionHandler() { delete interpreterState; }
     };
 
-    QVector<ExceptionHandler> unwindStack;
+    QVector<ExceptionHandler *> unwindStack;
 
     ExecutionEngine();
+    ~ExecutionEngine() { qDeleteAll(unwindStack); }
 
     Context *newContext();