QScriptEngine: Fix reentrency involving creation and desctructions of QScriptEngines

the currentIdentifierTable table, which is a static thread local variable, could be corrupted.

The main change is to fix the QScriptEngine constructor not to alter the currentIdentifierTable

This showed a lot of cases where APIShim guards where missings.

The problem was seen with creator, related to QTBUG-9426

Reviewed-by: Jedrzej Nowacki

1 files changed, 11 insertions, 0 deletions

diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp
index 7fd7093..460dddb 100644
--- a/src/script/api/qscriptvalueiterator.cpp
+++ b/src/script/api/qscriptvalueiterator.cpp
@@ -85,6 +85,17 @@ public:
         : initialized(false)
     {}
 
+    ~QScriptValueIteratorPrivate()
+    {
+        if (!initialized)
+            return;
+        QScriptEnginePrivate *eng_p = engine();
+        if (!eng_p)
+            return;
+        QScript::APIShim shim(eng_p);
+        propertyNames.clear(); //destroying the identifiers need to be done under the APIShim guard
+    }
+
     QScriptValuePrivate *object() const
     {
         return QScriptValuePrivate::get(objectValue);