Merge branch 'fix/utf8-settings-stringlist'

Author: tinysec

Function/BNSettingsSetStringList.cs

@@ -33,11 +33,12 @@ internal static extern bool BNSettingsSetStringList(
 			// const char* key
 		    [MarshalAs(UnmanagedType.LPUTF8Str)] string key  , 
 
-			// const char** _value
-		    string[] _value  , 
-			
+			// const char** _value (UTF-8 block built by the caller; string[] cannot be
+			// marshaled as UTF-8 by attribute, so it is passed as a raw pointer)
+		    IntPtr _value  ,
+
 			// uint64_t size
-		    ulong size  
+		    ulong size
 		);
 	}
 }

Function/BNSettingsUpdateStringListProperty.cs

@@ -27,12 +27,13 @@ internal static extern bool BNSettingsUpdateStringListProperty(
 			// const char* property
 		    [MarshalAs(UnmanagedType.LPUTF8Str)] string property  , 
 
-			// const char** _value
-		    string[] _value  , 
-			
+			// const char** _value (UTF-8 block built by the caller; string[] cannot be
+			// marshaled as UTF-8 by attribute, so it is passed as a raw pointer)
+		    IntPtr _value  ,
+
 			// uint64_t size
-		    ulong size  
-			
+		    ulong size
+
 		);
 	}
 }

Handle/BNSettings.cs

@@ -505,15 +505,23 @@ public bool SetStringList(
 		    SettingsScope scope = SettingsScope.SettingsAutoScope
 	    )
 	    {
-		    return NativeMethods.BNSettingsSetStringList(
-			    this.handle, 
-			    null == view ? IntPtr.Zero : view.DangerousGetHandle() ,
-			    null == function ? IntPtr.Zero : function.DangerousGetHandle(),
-			    scope ,
-			    key,
-			    value,
-			    (ulong)value.Length
-		    );
+		    // BN expects the value list as a UTF-8 char** block. .NET cannot marshal a
+		    // string[] element as UTF-8 via [MarshalAs], so build the block by hand; the
+		    // core copies it, so freeing after the call (allocator dispose) is safe.
+		    using (ScopedAllocator allocator = new ScopedAllocator())
+		    {
+			    IntPtr valueBlock = allocator.AllocUtf8StringArray(value);
+
+			    return NativeMethods.BNSettingsSetStringList(
+				    this.handle,
+				    null == view ? IntPtr.Zero : view.DangerousGetHandle() ,
+				    null == function ? IntPtr.Zero : function.DangerousGetHandle(),
+				    scope ,
+				    key,
+				    valueBlock,
+				    (ulong)value.Length
+			    );
+		    }
 	    }
 
 	    public bool SetJson(
@@ -619,9 +627,16 @@ public bool UpdateUInt64Property(string key , string property , ulong value)
 	    /// </summary>
 	    public bool UpdateStringListProperty(string key , string property , string[] value)
 	    {
-		    return NativeMethods.BNSettingsUpdateStringListProperty(
-			    this.handle , key , property , value , (ulong)value.Length
-		    );
+		    // Build the value list as a UTF-8 char** block (string[] cannot be UTF-8
+		    // marshaled by attribute); the core copies it, so free after the call.
+		    using (ScopedAllocator allocator = new ScopedAllocator())
+		    {
+			    IntPtr valueBlock = allocator.AllocUtf8StringArray(value);
+
+			    return NativeMethods.BNSettingsUpdateStringListProperty(
+				    this.handle , key , property , valueBlock , (ulong)value.Length
+			    );
+		    }
 	    }
 
 	    /// <summary>