Fixed memory leaks.

Change-Id: I641127b0d46f88291468af767cbbeb28ce5a75d9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/qmljs_engine.cpp b/qmljs_engine.cpp
index 30756e3..6367dcc 100644 (file)
--- a/qmljs_engine.cpp
+++ b/qmljs_engine.cpp
@@ -216,6 +216,7 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory)
 ExecutionEngine::~ExecutionEngine()
 {
     delete globalObject.asObject();
+    rootContext->destroy();
     delete rootContext;
     qDeleteAll(functions);
     delete memoryManager;

diff --git a/qmljs_environment.cpp b/qmljs_environment.cpp
index 067116d..15da373 100644 (file)
--- a/qmljs_environment.cpp
+++ b/qmljs_environment.cpp
@@ -229,6 +229,12 @@ void ExecutionContext::init(ExecutionEngine *eng)
     eng->exception = Value::undefinedValue();
 }
 
+void ExecutionContext::destroy()
+{
+    delete[] arguments;
+    delete[] locals;
+}
+
 bool ExecutionContext::deleteProperty(String *name)
 {
     for (ExecutionContext *ctx = this; ctx; ctx = ctx->outer()) {

diff --git a/qmljs_environment.h b/qmljs_environment.h
index faa04aa..e4bb0b9 100644 (file)
--- a/qmljs_environment.h
+++ b/qmljs_environment.h
@@ -96,8 +96,8 @@ struct ExecutionContext
         With *next;
     } *withObject;
 
-
     void init(ExecutionEngine *e);
+    void destroy();
 
     bool hasBinding(String *name) const;
     void createMutableBinding(String *name, bool deletable);

diff --git a/qv4ecmaobjects.cpp b/qv4ecmaobjects.cpp
index fa1b398..5d743db 100644 (file)
--- a/qv4ecmaobjects.cpp
+++ b/qv4ecmaobjects.cpp
@@ -298,10 +298,10 @@ static inline double DaylightSavingTA(double t)
 {
 #ifndef Q_WS_WIN
     long int tt = (long int)(t / msPerSecond);
-    struct tm *tmtm = localtime((const time_t*)&tt);
-    if (! tmtm)
+    struct tm tmtm;
+    if (!localtime_r((const time_t*)&tt, &tmtm))
         return 0;
-    return (tmtm->tm_isdst > 0) ? msPerHour : 0;
+    return (tmtm.tm_isdst > 0) ? msPerHour : 0;
 #else
     Q_UNUSED(t);
     /// ### implement me