Fetch secondary handle only if primary is non-null

The GC is not tracking the secondary handle once primary gets cleared.

Fixes #11270

diff --git a/src/vm/comdependenthandle.cpp b/src/vm/comdependenthandle.cpp
index 0f338217c9bf4256d88f43d7930c15d28f52083a..4763e4833a821b98e0e899e8d3d8320e5750a322 100644 (file)
--- a/src/vm/comdependenthandle.cpp
+++ b/src/vm/comdependenthandle.cpp
@@ -69,8 +69,14 @@ FCIMPLEND
 FCIMPL2(Object*, DependentHandle::nGetPrimaryAndSecondary, OBJECTHANDLE handle, Object **outSecondary)
 {
     FCALL_CONTRACT;
-    *outSecondary = OBJECTREFToObject(GetDependentHandleSecondary(handle));
-    return OBJECTREFToObject(ObjectFromHandle(handle));
+    _ASSERTE(handle != NULL && outSecondary != NULL);
+
+    OBJECTREF primary = ObjectFromHandle(handle);
+
+    // Secondary is tracked only if primary is non-null
+    *outSecondary = (primary != NULL) ? OBJECTREFToObject(GetDependentHandleSecondary(handle)) : NULL;
+
+    return OBJECTREFToObject(primary);
 }
 FCIMPLEND