cpputest · asgeroverby · Jun 5, 2019 · Jun 6, 2019 · Jun 6, 2019 · Jun 6, 2019
diff --git a/include/CppUTestExt/MockCheckedExpectedCall.h b/include/CppUTestExt/MockCheckedExpectedCall.h
@@ -79,7 +79,7 @@ class MockCheckedExpectedCall : public MockExpectedCall
     virtual MockExpectedCall& onObject(void* objectPtr) _override;
 
     virtual MockNamedValue getInputParameter(const SimpleString& name);
-    virtual MockNamedValue getOutputParameter(const SimpleString& name);
+    virtual MockNamedValue* getOutputParameter(const SimpleString& name);
     virtual SimpleString getInputParameterType(const SimpleString& name);
     virtual SimpleString getInputParameterValueString(const SimpleString& name);
 

diff --git a/include/CppUTestExt/MockNamedValue.h b/include/CppUTestExt/MockNamedValue.h
@@ -104,6 +104,8 @@ class MockNamedValue
     DEFAULT_COPY_CONSTRUCTOR(MockNamedValue)
     virtual ~MockNamedValue();
 
+    virtual void copyValue(const void* value, size_t size);
+
     virtual void setValue(bool value);
     virtual void setValue(int value);
     virtual void setValue(unsigned int value);
@@ -185,6 +187,7 @@ class MockNamedValue
         void* objectPointerValue_;
         const void* outputPointerValue_;
     } value_;
+    char * membuf_;
     size_t size_;
     MockNamedValueComparator* comparator_;
     MockNamedValueCopier* copier_;

diff --git a/src/CppUTestExt/MockActualCall.cpp b/src/CppUTestExt/MockActualCall.cpp
@@ -83,24 +83,30 @@ void MockCheckedActualCall::copyOutputParameters(MockCheckedExpectedCall* expect
 {
     for (MockOutputParametersListNode* p = outputParameterExpectations_; p; p = p->next_)
     {
-        MockNamedValue outputParameter = expectedCall->getOutputParameter(p->name_);
-        MockNamedValueCopier* copier = outputParameter.getCopier();
-        if (copier)
+	MockNamedValue dummy = MockNamedValue("");
+	MockNamedValue* outputParameter = expectedCall->getOutputParameter(p->name_);
+	if (outputParameter == NULLPTR)
+	{
+	    outputParameter = &dummy;
+	}
+	MockNamedValueCopier* copier = outputParameter->getCopier();
+
+	if (copier)
+	{
+	    copier->copy(p->ptr_, outputParameter->getConstObjectPointer());
+	}
+	else if ((outputParameter->getType() == "const void*") && (p->type_ == "void*"))
+	{
+	    const void* data = outputParameter->getConstPointerValue();
+	    size_t size = outputParameter->getSize();
+	    PlatformSpecificMemCpy(p->ptr_, data, size);
+	}
+        else if (outputParameter->getName() != "")
         {
-            copier->copy(p->ptr_, outputParameter.getConstObjectPointer());
-        }
-        else if ((outputParameter.getType() == "const void*") && (p->type_ == "void*"))
-        {
-            const void* data = outputParameter.getConstPointerValue();
-            size_t size = outputParameter.getSize();
-            PlatformSpecificMemCpy(p->ptr_, data, size);
-        }
-        else if (outputParameter.getName() != "")
-        {
-            SimpleString type = expectedCall->getOutputParameter(p->name_).getType();
+            SimpleString type = expectedCall->getOutputParameter(p->name_)->getType();
             MockNoWayToCopyCustomTypeFailure failure(getTest(), type);
             failTest(failure);
-        }
+	}
     }
 }
 

diff --git a/src/CppUTestExt/MockExpectedCall.cpp b/src/CppUTestExt/MockExpectedCall.cpp
@@ -227,8 +227,7 @@ MockExpectedCall& MockCheckedExpectedCall::withOutputParameterReturning(const Si
 {
     MockNamedValue* newParameter = new MockExpectedFunctionParameter(name);
     outputParameters_->add(newParameter);
-    newParameter->setValue(value);
-    newParameter->setSize(size);
+    newParameter->copyValue(value, size);
     return *this;
 }
 
@@ -264,10 +263,9 @@ MockNamedValue MockCheckedExpectedCall::getInputParameter(const SimpleString& na
     return (p) ? *p : MockNamedValue("");
 }
 
-MockNamedValue MockCheckedExpectedCall::getOutputParameter(const SimpleString& name)
+MockNamedValue* MockCheckedExpectedCall::getOutputParameter(const SimpleString& name)
 {
-    MockNamedValue * p = outputParameters_->getValueByName(name);
-    return (p) ? *p : MockNamedValue("");
+    return outputParameters_->getValueByName(name);
 }
 
 bool MockCheckedExpectedCall::areParametersMatchingActualCall()

diff --git a/src/CppUTestExt/MockNamedValue.cpp b/src/CppUTestExt/MockNamedValue.cpp
@@ -38,13 +38,17 @@ void MockNamedValue::setDefaultComparatorsAndCopiersRepository(MockNamedValueCom
     defaultRepository_ = repository;
 }
 
-MockNamedValue::MockNamedValue(const SimpleString& name) : name_(name), type_("int"), size_(0), comparator_(NULLPTR), copier_(NULLPTR)
+MockNamedValue::MockNamedValue(const SimpleString& name) : name_(name), type_("int"), membuf_(NULLPTR), size_(0), comparator_(NULLPTR), copier_(NULLPTR)
 {
     value_.intValue_ = 0;
 }
 
 MockNamedValue::~MockNamedValue()
 {
+    if ( (membuf_ != NULLPTR)) {
+	delete [] membuf_;
+	membuf_ = NULLPTR;
+    }
 }
 
 void MockNamedValue::setValue(bool value)
@@ -129,6 +133,17 @@ void MockNamedValue::setValue(const void* value)
     value_.constPointerValue_ = value;
 }
 
+void MockNamedValue::copyValue(const void* value, size_t size)
+{
+	type_ = "const void*";
+	if (membuf_ == NULLPTR) {
+		membuf_ = new char[size];
+	}
+	PlatformSpecificMemCpy(membuf_, value, size);
+	value_.constPointerValue_ = (const void*) membuf_;
+	size_ = size;
+}
+
 void MockNamedValue::setValue(void (*value)())
 {
     type_ = "void (*)()";

diff --git a/tests/CppUTestExt/MockParameterTest.cpp b/tests/CppUTestExt/MockParameterTest.cpp
@@ -634,6 +634,27 @@ TEST(MockParameterTest, outputParameterSucceeds)
     mock().checkExpectations();
 }
 
+TEST(MockParameterTest, outputParameterIsCopiedOnExpect)
+{
+    int param = 1;
+    int retval = 2;
+
+    /*
+       The mock method .withOutputParameterReturning() should copied
+       on .expectOneCall(), but is actually dereference on
+       .actualCall(). This will allow the memory pointed to by
+       .withOutputParameterReturning() to be changed between calls.
+    */
+
+    mock().expectOneCall("function").withOutputParameterReturning("parameterName", &retval, sizeof(retval));
+    retval = 7;
+
+    mock().actualCall("function").withOutputParameter("parameterName", &param);
+    CHECK_EQUAL(param, 2); // Check fails !!!
+
+    mock().checkExpectations();
+}
+
 TEST(MockParameterTest, noActualCallForOutputParameter)
 {
     MockFailureReporterInstaller failureReporterInstaller;
@@ -904,4 +925,3 @@ TEST(MockParameterTest, expectMultipleMultipleCallsWithParameters)
 
     mock().checkExpectations();
 }
-