[NativeAPI] 修复 Keystore 在接受调用方时转换不当问题

Author: kamenomi-dev

Lagrange.Core.NativeAPI/NativeModel/Common/BotKeystoreStruct.cs

@@ -5,7 +5,8 @@ namespace Lagrange.Core.NativeAPI.NativeModel.Common
 {
     public struct BotKeystoreStruct
     {
-        public BotKeystoreStruct() { }
+        public BotKeystoreStruct()
+        { }
 
         public long Uin = 0;
 
@@ -105,7 +106,8 @@ public static implicit operator BotKeystoreStruct(BotKeystore keystore)
             {
                 bytePsKey[i++] = new ByteArrayKVPNative
                 {
-                    Key = Encoding.UTF8.GetBytes(kvp.Key), Value = Encoding.UTF8.GetBytes(kvp.Value)
+                    Key = Encoding.UTF8.GetBytes(kvp.Key),
+                    Value = Encoding.UTF8.GetBytes(kvp.Value)
                 };
             }
 
@@ -143,7 +145,8 @@ public BotKeystore ToKeystoreWithoutFree()
             var psKey = new Dictionary<string, string>();
             foreach (var kvp in (ByteArrayKVPNative[])PsKey)
             {
-                psKey[Encoding.UTF8.GetString(kvp.Key)] = Encoding.UTF8.GetString(kvp.Value);
+                // psKey[Encoding.UTF8.GetString(kvp.Key)] = Encoding.UTF8.GetString(kvp.Value); Oh shit, are u okay?
+                psKey[Encoding.UTF8.GetString(kvp.Key.ToByteArrayWithoutFree())] = Encoding.UTF8.GetString(kvp.Value.ToByteArrayWithoutFree());
             }
 
             return new BotKeystore()
@@ -178,4 +181,4 @@ public BotKeystore ToKeystoreWithoutFree()
             };
         }
     }
-}
+}

Lagrange.Core.NativeAPI/NativeModel/Common/ByteArrayDictNative.cs

@@ -6,7 +6,7 @@ public struct ByteArrayDictNative
 {
     public int Length;
     public IntPtr Data;
-    
+
     public static implicit operator ByteArrayDictNative(ByteArrayKVPNative[] dict)
     {
         int size = Marshal.SizeOf<ByteArrayKVPNative>();
@@ -15,26 +15,26 @@ public static implicit operator ByteArrayDictNative(ByteArrayKVPNative[] dict)
         {
             Marshal.StructureToPtr(dict[i], ptr + i * size, false);
         }
-        
+
         return new ByteArrayDictNative { Length = dict.Length, Data = ptr };
     }
-    
+
     public static implicit operator ByteArrayKVPNative[](ByteArrayDictNative dict)
     {
         if (dict.Data == IntPtr.Zero || dict.Length == 0)
         {
             return [];
         }
-        
+
         ByteArrayKVPNative[] result = new ByteArrayKVPNative[dict.Length];
         int size = Marshal.SizeOf<ByteArrayKVPNative>();
         for (int i = 0; i < dict.Length; i++)
         {
             result[i] = Marshal.PtrToStructure<ByteArrayKVPNative>(dict.Data + i * size);
         }
-        
-        Marshal.FreeHGlobal(dict.Data);
-        
+
+        // Marshal.FreeHGlobal(dict.Data); Why release here?
+
         return result;
     }
 }