Unregister callback when setting a provider for deferred delete (#40191)

davmason · web-flow · commit d32ba13b0ff6 · 2020-07-31T15:33:24.000-07:00
diff --git a/src/coreclr/src/vm/eventpipeprovider.cpp b/src/coreclr/src/vm/eventpipeprovider.cpp
@@ -306,6 +306,9 @@ void EventPipeProvider::SetDeleteDeferred()
 {
     LIMITED_METHOD_CONTRACT;
     m_deleteDeferred = true;
+    // EventSources will be collected once they ungregister themselves,
+    // so we can't call back in to them.
+    m_pCallbackFunction = NULL;
 }
 
 void EventPipeProvider::RefreshAllEvents()

Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,9 @@ void EventPipeProvider::SetDeleteDeferred()`
`306`	`306`	`{`
`307`	`307`	`LIMITED_METHOD_CONTRACT;`
`308`	`308`	`m_deleteDeferred = true;`
	`309`	`+ // EventSources will be collected once they ungregister themselves,`
	`310`	`+ // so we can't call back in to them.`
	`311`	`+ m_pCallbackFunction = NULL;`
`309`	`312`	`}`
`310`	`313`
`311`	`314`	`void EventPipeProvider::RefreshAllEvents()`