Make ComponentActivator.[LoadAssemblyAnd]GetFunctionPointer set initialize out pointer to 0 (dotnet#107426)

elinor-fung · web-flow · commit d4601d390b6c · 2024-09-06T07:11:23.000-07:00
diff --git a/src/libraries/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComponentActivator.cs b/src/libraries/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComponentActivator.cs
@@ -67,6 +67,9 @@ public static unsafe int LoadAssemblyAndGetFunctionPointer(IntPtr assemblyPathNa
                                                                    IntPtr reserved,
                                                                    IntPtr functionHandle)
         {
+            if (functionHandle != IntPtr.Zero)
+                *(IntPtr*)functionHandle = 0;
+
             if (!IsSupported)
                 return HostFeatureDisabled;
 
@@ -229,6 +232,9 @@ public static unsafe int GetFunctionPointer(IntPtr typeNameNative,
                                                     IntPtr reserved,
                                                     IntPtr functionHandle)
         {
+            if (functionHandle != IntPtr.Zero)
+                *(IntPtr*)functionHandle = 0;
+
             if (!IsSupported)
             {
 #if CORECLR

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,9 @@ public static unsafe int LoadAssemblyAndGetFunctionPointer(IntPtr assemblyPathNa`
`67`	`67`	`IntPtr reserved,`
`68`	`68`	`IntPtr functionHandle)`
`69`	`69`	`{`
	`70`	`+ if (functionHandle != IntPtr.Zero)`
	`71`	`+ (IntPtr)functionHandle = 0;`
	`72`	`+`
`70`	`73`	`if (!IsSupported)`
`71`	`74`	`return HostFeatureDisabled;`
`72`	`75`
`@@ -229,6 +232,9 @@ public static unsafe int GetFunctionPointer(IntPtr typeNameNative,`
`229`	`232`	`IntPtr reserved,`
`230`	`233`	`IntPtr functionHandle)`
`231`	`234`	`{`
	`235`	`+ if (functionHandle != IntPtr.Zero)`
	`236`	`+ (IntPtr)functionHandle = 0;`
	`237`	`+`
`232`	`238`	`if (!IsSupported)`
`233`	`239`	`{`
`234`	`240`	`#if CORECLR`