Fix deadlock in VMOps::For

fixes #8236

diff --git a/lib/config/vmops.hpp b/lib/config/vmops.hpp
index 91663a1c5d6dbd4d12971a43d186486a4c3afd11..cb5f3e508b681697492dd92cf802d1359b4e0308 100644 (file)
--- a/lib/config/vmops.hpp
+++ b/lib/config/vmops.hpp
@@ -137,19 +137,8 @@ public:
 
                        Array::Ptr arr = value;
 
-                       ObjectLock olock(arr);
-                       BOOST_FOREACH(const Value& value, arr) {
-                               frame.Locals->Set(fkvar, value);
-                               expression->Evaluate(frame);
-                       }
-               } else if (value.IsString()) {
-                       if (!fvvar.IsEmpty())
-                               BOOST_THROW_EXCEPTION(ScriptError("Cannot use dictionary iterator for string.", debugInfo));
-
-                       String str = value;
-
-                       BOOST_FOREACH(char ch, str) {
-                               frame.Locals->Set(fkvar, String(1, ch));
+                       for (Array::SizeType i = 0; i < arr->GetLength(); i++) {
+                               frame.Locals->Set(fkvar, arr->Get(i));
                                expression->Evaluate(frame);
                        }
                } else if (value.IsObjectType<Dictionary>()) {
@@ -157,11 +146,18 @@ public:
                                BOOST_THROW_EXCEPTION(ScriptError("Cannot use array iterator for dictionary.", debugInfo));
 
                        Dictionary::Ptr dict = value;
+                       std::vector<String> keys;
+
+                       {
+                               ObjectLock olock(dict);
+                               BOOST_FOREACH(const Dictionary::Pair& kv, dict) {
+                                       keys.push_back(kv.first);
+                               }
+                       }
 
-                       ObjectLock olock(dict);
-                       BOOST_FOREACH(const Dictionary::Pair& kv, dict) {
-                               frame.Locals->Set(fkvar, kv.first);
-                               frame.Locals->Set(fvvar, kv.second);
+                       BOOST_FOREACH(const String& key, keys) {
+                               frame.Locals->Set(fkvar, key);
+                               frame.Locals->Set(fvvar, dict->Get(key));
                                expression->Evaluate(frame);
                        }
                } else