ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-09-06 02:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #111 from 0ge/master

Browse Source 
Check destination when returning thru ptr
This commit is contained in:
Mark VanderVoord
2017-02-16 11:09:50 -05:00
committed by GitHub
parent eddfb75d59 9e49bace32
commit 42a937a097
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock_generator_plugin_return_thru_ptr.rb
+1
View File
@@ -64,6 +64,7 @@ class CMockGeneratorPluginReturnThruPtr
if (@utils.ptr_or_str?(arg[:type]) and not arg[:const?])
lines << " if (cmock_call_instance->ReturnThruPtr_#{arg_name}_Used)\n"
lines << " {\n"
lines << " UNITY_TEST_ASSERT_NOT_NULL(#{arg_name}, cmock_line, CMockStringPtrIsNULL);\n"
lines << " memcpy(#{arg_name}, cmock_call_instance->ReturnThruPtr_#{arg_name}_Val,\n"
lines << " cmock_call_instance->ReturnThruPtr_#{arg_name}_Size);\n"
lines << " }\n"
src/cmock.c
+1
View File
@@ -16,6 +16,7 @@ const char* CMockStringCalledLate = "Called later than expected.";
const char* CMockStringCallOrder = "Called out of order.";
const char* CMockStringIgnPreExp = "IgnoreArg called before Expect.";
const char* CMockStringPtrPreExp = "ReturnThruPtr called before Expect.";
const char* CMockStringPtrIsNULL = "Pointer is NULL.";
const char* CMockStringExpNULL = "Expected NULL.";
const char* CMockStringMismatch = "Function called with unexpected argument value.";
src/cmock_internals.h
+1
View File
@@ -16,6 +16,7 @@ extern const char* CMockStringCalledLate;
extern const char* CMockStringCallOrder;
extern const char* CMockStringIgnPreExp;
extern const char* CMockStringPtrPreExp;
extern const char* CMockStringPtrIsNULL;
extern const char* CMockStringExpNULL;
extern const char* CMockStringMismatch;