fix issue with FromManaged returning an HSTRING reference, rather tha…

…n allocating an HSTRING, causing crashes (#551)
microsoft · Nov 3, 2020 · 8d6b661 · 8d6b661
1 parent 25e2ed4
commit 8d6b661
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/WinRT.Runtime/Projections/Type.cs b/WinRT.Runtime/Projections/Type.cs
@@ -29,8 +29,8 @@ internal void Dispose()
             }
         }
 
-        public static Marshaler CreateMarshaler(global::System.Type value)
-        {
+        private static (String Name, TypeKind Kind) ToAbi(global::System.Type value)
+        {
             TypeKind kind = TypeKind.Custom;
 
             if (value is object)
@@ -47,12 +47,18 @@ public static Marshaler CreateMarshaler(global::System.Type value)
                 {
                     kind = TypeKind.Metadata;
                 }
-            }
+            }
+
+            return (kind == TypeKind.Custom ? value.AssemblyQualifiedName : TypeNameSupport.GetNameForType(value, TypeNameGenerationFlags.None), kind);
+        }
 
+        public static Marshaler CreateMarshaler(global::System.Type value)
+        {
+            var abi = ToAbi(value);
             return new Marshaler
             {
-                Name = MarshalString.CreateMarshaler(kind == TypeKind.Custom ? value.AssemblyQualifiedName : TypeNameSupport.GetNameForType(value, TypeNameGenerationFlags.None)),
-                Kind = kind
+                Name = MarshalString.CreateMarshaler(abi.Name),
+                Kind = abi.Kind
             };
         }
 
@@ -85,8 +91,13 @@ public static unsafe void CopyAbi(Marshaler arg, IntPtr dest) =>
             *(Type*)dest.ToPointer() = GetAbi(arg);
 
         public static Type FromManaged(global::System.Type value)
-        {
-            return GetAbi(CreateMarshaler(value));
+        {
+            var abi = ToAbi(value);
+            return new Type
+            {
+                Name = MarshalString.FromManaged(abi.Name),
+                Kind = abi.Kind
+            };
         }
 
         public static unsafe void CopyManaged(global::System.Type arg, IntPtr dest) =>