Commitc99cdf3

committed

Throw exception trying to add a reflected object after the hashset is cleared

1 parent6f0f671 commitc99cdf3Copy full SHA for c99cdf3

File tree

+10

-0

lines changed

+10

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ internal static void Initialize(bool initSigs = false)`
`158`	`158`	`ClassManager.Reset();`
`159`	`159`	`ClassDerivedObject.Reset();`
`160`	`160`	`TypeManager.Initialize();`
	`161`	`+CLRObject.creationBlocked=false;`
`161`	`162`	`_typesInitialized=true;`
`162`	`163`
`163`	`164`	`// Initialize modules that depend on the runtime class.`
`@@ -356,6 +357,7 @@ static bool TryCollectingGarbage(int runs, bool forceBreakLoops,`
`356`	`357`	`{`
`357`	`358`	`NullGCHandles(CLRObject.reflectedObjects);`
`358`	`359`	`CLRObject.reflectedObjects.Clear();`
	`360`	`+CLRObject.creationBlocked=true;`
`359`	`361`	`}`
`360`	`362`	`}`
`361`	`363`	`returnfalse;`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,15 @@ internal sealed class CLRObject : ManagedType`
`11`	`11`	`{`
`12`	`12`	`internalreadonlyobjectinst;`
`13`	`13`
	`14`	`+internalstaticboolcreationBlocked=false;`
	`15`	`+`
`14`	`16`	`// "borrowed" references`
`15`	`17`	`internalstaticreadonlyHashSet<IntPtr>reflectedObjects=new();`
`16`	`18`	`staticNewReferenceCreate(objectob,BorrowedReferencetp)`
`17`	`19`	`{`
	`20`	`+if(creationBlocked)`
	`21`	`+thrownewInvalidOperationException("Reflected objects should not be created anymore.");`
	`22`	`+`
`18`	`23`	`Debug.Assert(tp!=null);`
`19`	`24`	`varpy=Runtime.PyType_GenericAlloc(tp,0);`
`20`	`25`
`@@ -61,6 +66,9 @@ internal static void Restore(object ob, BorrowedReference pyHandle, Dictionary<s`
`61`	`66`
`62`	`67`	`protectedoverridevoidOnLoad(BorrowedReferenceob,Dictionary<string,object?>?context)`
`63`	`68`	`{`
	`69`	`+if(creationBlocked)`
	`70`	`+thrownewInvalidOperationException("Reflected objects should not be loaded anymore.");`
	`71`	`+`
`64`	`72`	`base.OnLoad(ob,context);`
`65`	`73`	`GCHandlegc=GCHandle.Alloc(this);`
`66`	`74`	`SetGCHandle(ob,gc);`

Comments

(0)