Memory leak in QScriptEngineAgent.

The documentation of the agent constructor specify that the agant is
owned by the engine. Even if the agent is not set to the engine

Reviewed-by: Kent Hansen

3 files changed, 2 insertions, 3 deletions

diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 033d92e99..f4e959447 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -3585,9 +3585,6 @@ void QScriptEngine::setAgent(QScriptEngineAgent *agent)
         QScriptEngineAgentPrivate::get(d->activeAgent)->detach();
     d->activeAgent = agent;
     if (agent) {
-        int index = d->ownedAgents.indexOf(agent);
-        if (index == -1)
-            d->ownedAgents.append(agent);
         QScriptEngineAgentPrivate::get(agent)->attach();
     }
 }
diff --git a/src/script/api/qscriptengineagent.cpp b/src/script/api/qscriptengineagent.cpp
index b18f29d6d..193ee21e9 100644
--- a/src/script/api/qscriptengineagent.cpp
+++ b/src/script/api/qscriptengineagent.cpp
@@ -213,6 +213,7 @@ QScriptEngineAgent::QScriptEngineAgent(QScriptEngine *engine)
 {
     d_ptr->q_ptr = this;
     d_ptr->engine = QScriptEnginePrivate::get(engine);
+    d_ptr->engine->ownedAgents.append(this);
 }
 
 /*!
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 0c679875d..df7414431 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -3913,6 +3913,7 @@ void tst_QScriptEngine::getSetAgent()
         TestAgent *agent = new TestAgent(&eng);
         QTest::ignoreMessage(QtWarningMsg, "QScriptEngine::setAgent(): cannot set agent belonging to different engine");
         eng2.setAgent(agent);
+        QCOMPARE(eng2.agent(), (QScriptEngineAgent*)0);
     }
 }