From cd49eb097816f18f4673aabb45a1c5fead10235d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 27 Jun 2020 20:59:10 +0200
Subject: [PATCH] Fix Cppcheck warnings

---
 lib/exprengine.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/exprengine.cpp b/lib/exprengine.cpp
index 06d40072d..e47faf2a8 100644
--- a/lib/exprengine.cpp
+++ b/lib/exprengine.cpp
@@ -343,6 +343,7 @@ namespace {
 
         Data(const Data &old)
             : DataBase(old.currentFunction, old.settings)
+            , memory(old.memory)
             , symbolValueIndex(old.symbolValueIndex)
             , errorLogger(old.errorLogger)
             , tokenizer(old.tokenizer)
@@ -351,7 +352,6 @@ namespace {
             , startTime(old.startTime)
             , mTrackExecution(old.mTrackExecution)
             , mDataIndex(mTrackExecution->getNewDataIndex()) {
-            memory = old.memory;
             for (auto &it: memory) {
                 if (!it.second)
                     continue;
@@ -832,9 +832,8 @@ ExprEngine::ArrayValue::ArrayValue(DataBase *data, const Variable *var)
 ExprEngine::ArrayValue::ArrayValue(const std::string &name, const ExprEngine::ArrayValue &arrayValue)
     : Value(name, ExprEngine::ValueType::ArrayValue)
     , pointer(arrayValue.pointer), nullPointer(arrayValue.nullPointer), uninitPointer(arrayValue.uninitPointer)
+    , data(arrayValue.data), size(arrayValue.size)
 {
-    size = arrayValue.size;
-    data = arrayValue.data;
 }