fixed potential memory leak when using parameter matching

Author: sglienke

Source/Core/Mocking/Spring.Mocking.Interceptor.pas

@@ -408,6 +408,7 @@ procedure TMockInterceptor.InterceptArrange(const invocation: IInvocation);
       fMatch := CreateArgMatch(invocation.Arguments, invocation.Method.GetParameters);
     fExpectedCalls.AddRange(invocation.Method, CreateMethodCalls(invocation.Method));
   finally
+    CleanupArguments(invocation.Arguments);
     fState := TMockState.Act;
     fMatch := nil;
   end;
@@ -432,6 +433,7 @@ procedure TMockInterceptor.InterceptAssert(const invocation: IInvocation);
     else
       callCount := 0;
   finally
+    CleanupArguments(invocation.Arguments);
     fState := TMockState.Act;
     fMatch := nil;
   end;

Source/Core/Mocking/Spring.Mocking.Matching.pas

@@ -130,6 +130,8 @@   TAny = record
     class operator Implicit(const value: TAny): string; overload;
   end;
 
+procedure CleanupArguments(const arguments: TArray<TValue>);
+
 implementation
 
 uses
@@ -167,20 +169,17 @@ function GetIndexString(const v: TValue): Integer;
 
 function GetIndexObject(const v: TValue): Integer;
 begin
-  Result := v.AsType<TIndexWrapper>.fIndex;
-  v.AsType<TIndexWrapper>.Free;
+  Result := TIndexWrapper(TValueData(v).FAsObject).fIndex;
 end;
 
 function GetIndexInterface(const v: TValue): Integer;
 begin
-  Result := (v.AsType<IInterface> as TIndexWrapper).fIndex;
-  PValue(@v)^ := TValue.Empty;
+  Result := (PInterface(TValueData(v).FValueData.GetReferenceToRawData)^ as TIndexWrapper).fIndex;
 end;
 
 function GetIndexPointer(const v: TValue): Integer;
 begin
-  Result := v.AsType<TIndexWrapper>.fIndex;
-  v.AsType<TIndexWrapper>.Free;
+  Result := Integer(TValueData(v).FAsPointer);
 end;
 
 function GetIndexRecord(const v: TValue): Integer;
@@ -255,7 +254,7 @@ procedure SetIndexString(typeInfo: PTypeInfo; index: Integer; var Result);
 procedure SetIndexObject(typeInfo: PTypeInfo; //FI:O804
   index: Integer; var Result);
 begin
-  TObject(PPointer(@Result)^) := TIndexWrapper.Create(index);
+  TObject(Result) := TIndexWrapper.Create(index);
 end;
 
 procedure SetIndexInterface(typeInfo: PTypeInfo; //FI:O804
@@ -267,7 +266,7 @@ procedure SetIndexInterface(typeInfo: PTypeInfo; //FI:O804
 procedure SetIndexPointer(typeInfo: PTypeInfo; //FI:O804
   index: Integer; var Result);
 begin
-  Pointer(Result) := TIndexWrapper.Create(index);
+  NativeInt(Result) := index;
 end;
 
 procedure SetIndexRecord(typeInfo: PTypeInfo; index: Integer; var Result);
@@ -301,6 +300,18 @@ procedure SetIndexVariant(typeInfo: PTypeInfo; //FI:O804
   PVariant(@Result)^ := index;
 end;
 
+procedure CleanupArguments(const arguments: TArray<TValue>);
+var
+  i: Integer;
+begin
+  for i := 0 to High(arguments) do
+    if arguments[i].IsType(TypeInfo(TIndexWrapper)) then
+    begin
+      TObject(TValueData(arguments[i]).FAsObject).Free;
+      TValueData(arguments[i]).FAsObject := nil;
+    end;
+end;
+
 
 {$REGION 'TMatcherFactory'}
 
@@ -375,7 +386,7 @@ class function TMatcherFactory.GetIndex(const v: TValue): Integer;
     GetIndexFail, GetIndexOrdinal, GetIndexObject, GetIndexFail, GetIndexString,
     GetIndexString, GetIndexString, GetIndexVariant, GetIndexArray, GetIndexRecord,
     GetIndexInterface, GetIndexOrdinal, GetIndexArray, GetIndexString, GetIndexFail,
-    GetIndexPointer, GetIndexFail {$IF Declared(tkMRecord)}, GetIndexFail{$IFEND});
+    GetIndexObject, GetIndexFail {$IF Declared(tkMRecord)}, GetIndexFail{$IFEND});
 begin
   Result := Handlers[TValueData(v).FTypeInfo.Kind](v) - 1;
 end;
@@ -387,7 +398,7 @@ class procedure TMatcherFactory.SetIndex(typeInfo: PTypeInfo; index: Integer; va
     SetIndexFail, SetIndexOrdinal, SetIndexObject, SetIndexFail, SetIndexString,
     SetIndexString, SetIndexString, SetIndexVariant, SetIndexArray, SetIndexRecord,
     SetIndexInterface, SetIndexOrdinal, SetIndexArray, SetIndexString, SetIndexFail,
-    SetIndexPointer, SetIndexFail {$IF Declared(tkMRecord)}, SetIndexFail{$IFEND});
+    SetIndexObject, SetIndexFail {$IF Declared(tkMRecord)}, SetIndexFail{$IFEND});
 begin
   Handlers[typeInfo.Kind](typeInfo, index + 1, Result);
 end;
@@ -469,7 +480,7 @@ class function TArg.IsEqual<T>(const value: T): T;
   Result := TMatcherFactory.CreateMatcher<T>(
     function(const arg: TValue): Boolean
     begin
-      Result := arg.Convert<T>.Equals(TValue.From<T>(value));
+      Result := arg.Convert(TypeInfo(T)).Equals(TValue.From(@value, TypeInfo(T)));
     end);
 end;
 

Tests/Source/Core/Spring.Tests.Mocking.pas

@@ -50,6 +50,7 @@   TParameterMatchingTests = class(TTestCase)
     procedure TestSet;
 
     procedure ReturnsMultipleValues;
+    procedure WrapperObjectsNotLeaking;
   end;
 
   ReceivedChecksForInputValueOfVarParams = class(TTestCase)
@@ -107,6 +108,7 @@ implementation
     procedure TestDynArray(const v: TArray<string>);
     procedure TestEnum(const value: TTestEnum);
     procedure TestSet(const n: Integer; const value: TTestSet; const i: Integer = 0);
+    procedure TestObject(const obj: TObject);
     function GetNext: Integer;
 
     function GetEvent: IInvokableNotifyEvent<Integer>;
@@ -396,6 +398,16 @@ procedure TParameterMatchingTests.VerifyChecksParameterValuesProperly;
     end);
 end;
 
+procedure TParameterMatchingTests.WrapperObjectsNotLeaking;
+var
+  mock: Mock<IMockTest>;
+begin
+  mock.Setup.Executes.When(Args.Any).TestObject(Arg.IsAny<TObject>);
+  mock.Instance.TestObject(nil);
+  mock.Received.TestObject(Arg = nil);
+  Pass;
+end;
+
 {$ENDREGION}