From 4c7ea21ceaf9f4cbcfcd0131b0721fd12639294c Mon Sep 17 00:00:00 2001 From: James Groom Date: Tue, 30 Apr 2024 22:06:59 +1000 Subject: [PATCH] Add a failsafe to Nyma's settings callback to avoid NREs --- src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.cs b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.cs index 12737402d0..c3995e39a9 100644 --- a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.cs +++ b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.cs @@ -218,7 +218,7 @@ namespace BizHawk.Emulation.Cores.Waterbox private unsafe void SettingsQuery(string name, IntPtr dest) { var val = SettingsQuery(name); - var bytes = Encoding.UTF8.GetBytes(val); + var bytes = val is null ? Array.Empty() : Encoding.UTF8.GetBytes(val); if (bytes.Length > 255) { throw new InvalidOperationException($"Value {val} for setting {name} was too long");