Fix AV in IOC for Singleton non-interfaced class

A non-interfaced class registered in the IOC as Singleton, was raising an AV when the container was freed
exilon · Mar 19, 2023 · 2bb4861 · 2bb4861
1 parent 767356c
commit 2bb4861
Show file tree

Hide file tree

Showing 2 changed files with 419 additions and 234 deletions.
diff --git a/Quick.IOC.pas b/Quick.IOC.pas
@@ -442,7 +442,9 @@ destructor TIocRegistrator.Destroy;
     if fDependencyOrder[i] <> nil then
     begin
       //free singleton instances not interfaced
-      if (fDependencyOrder[i] is TIocRegistrationInstance) and (TIocRegistrationInstance(fDependencyOrder[i]).IsSingleton) then TIocRegistrationInstance(regs[i]).Instance.Free;
+      if (fDependencyOrder[i] is TIocRegistrationInstance) and
+          (TIocRegistrationInstance(fDependencyOrder[i]).IsSingleton) then
+            TIocRegistrationInstance(fDependencyOrder[i]).Instance.Free;
       fDependencyOrder[i].Free;
     end;
   end;