From fd1aaa1997c31d8a373c4f9fbc843624afb9e714 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 24 Mar 2014 09:15:45 +0100
Subject: [PATCH] Add missing locks.

Refs #5846
---
 lib/config/aexpression.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/config/aexpression.cpp b/lib/config/aexpression.cpp
index 8abb64990..0a1dabb2b 100644
--- a/lib/config/aexpression.cpp
+++ b/lib/config/aexpression.cpp
@@ -25,6 +25,7 @@
 #include "base/scriptfunction.h"
 #include "base/scriptvariable.h"
 #include "base/utility.h"
+#include "base/objectlock.h"
 #include <boost/foreach.hpp>
 #include <boost/exception_ptr.hpp>
 #include <boost/exception/errinfo_nested_exception.hpp>
@@ -57,6 +58,7 @@ void AExpression::ExtractPath(const std::vector<String>& path, const Array::Ptr&
 
 	if (m_Operator == &AExpression::OpDict) {
 		Array::Ptr exprl = m_Operand1;
+		ObjectLock olock(exprl);
 		BOOST_FOREACH(const AExpression::Ptr& expr, exprl) {
 			expr->ExtractPath(path, result);
 		}
@@ -68,6 +70,7 @@ void AExpression::ExtractPath(const std::vector<String>& path, const Array::Ptr&
 		if (path.size() == 1) {
 			VERIFY(exprl->m_Operator == &AExpression::OpDict);
 			Array::Ptr subexprl = exprl->m_Operand1;
+			ObjectLock olock(subexprl);
 			BOOST_FOREACH(const AExpression::Ptr& expr, subexprl) {
 				result->Add(expr);
 			}
@@ -86,6 +89,7 @@ void AExpression::FindDebugInfoPath(const std::vector<String>& path, DebugInfo&
 
 	if (m_Operator == &AExpression::OpDict) {
 		Array::Ptr exprl = m_Operand1;
+		ObjectLock olock(exprl);
 		BOOST_FOREACH(const AExpression::Ptr& expr, exprl) {
 			expr->FindDebugInfoPath(path, result);
 		}
@@ -113,6 +117,7 @@ void AExpression::DumpOperand(std::ostream& stream, const Value& operand, int in
 	if (operand.IsObjectType<Array>()) {
 		Array::Ptr arr = operand;
 		stream << String(indent, ' ') << "Array:\n";
+		ObjectLock olock(arr);
 		BOOST_FOREACH(const Value& elem, arr) {
 			DumpOperand(stream, elem, indent + 1);
 		}
@@ -250,6 +255,7 @@ Value AExpression::OpIn(const AExpression *expr, const Dictionary::Ptr& locals)
 		
 	Array::Ptr arr = right;
 	bool found = false;
+	ObjectLock olock(arr);
 	BOOST_FOREACH(const Value& value, arr) {
 		if (value == left) {
 			found = true;
@@ -285,6 +291,7 @@ Value AExpression::OpFunctionCall(const AExpression *expr, const Dictionary::Ptr
 
 	Array::Ptr arr = expr->EvaluateOperand2(locals);
 	std::vector<Value> arguments;
+	ObjectLock olock(arr);
 	BOOST_FOREACH(const AExpression::Ptr& aexpr, arr) {
 		arguments.push_back(aexpr->Evaluate(locals));
 	}
@@ -298,6 +305,7 @@ Value AExpression::OpArray(const AExpression *expr, const Dictionary::Ptr& local
 	Array::Ptr result = make_shared<Array>();
 
 	if (arr) {
+		ObjectLock olock(arr);
 		BOOST_FOREACH(const AExpression::Ptr& aexpr, arr) {
 			result->Add(aexpr->Evaluate(locals));
 		}
@@ -315,6 +323,7 @@ Value AExpression::OpDict(const AExpression *expr, const Dictionary::Ptr& locals
 	result->Set("__parent", locals);
 
 	if (arr) {
+		ObjectLock olock(arr);
 		BOOST_FOREACH(const AExpression::Ptr& aexpr, arr) {
 			aexpr->Evaluate(in_place ? locals : result);
 		}