From 645d9e9632e061b26b2312d144a26fe8dc75cd1c Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 1 Jan 2015 16:33:04 +0100 Subject: Fix constructions of QJSEngine objects The private class is not empty anymore, so calling the wrong constructor would lead to memory corruption Change-Id: I6d477fc63bba46be733273f548397c2a50ef2bf4 Reviewed-by: Simon Hausmann --- src/qml/jsapi/qjsengine.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/qml/jsapi') diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 04ed341a50..09891019c5 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -165,7 +165,8 @@ QT_BEGIN_NAMESPACE \l{ECMA-262}, Section 15.1. */ QJSEngine::QJSEngine() - : d(new QV8Engine(this)) + : QObject(*new QJSEnginePrivate, 0) + , d(new QV8Engine(this)) { } @@ -177,7 +178,7 @@ QJSEngine::QJSEngine() */ QJSEngine::QJSEngine(QObject *parent) - : QObject(parent) + : QObject(*new QJSEnginePrivate, parent) , d(new QV8Engine(this)) { } -- cgit v1.2.3